diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..2f524bf
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,62 @@
+# Contributing to Eclipse Dynamic Languages Toolkit
+
+Thanks for your interest in this project.
+
+## Project description
+
+The Eclipse Dynamic Languages Toolkit (DLTK) is a tool for vendors, researchers,
+and end-users who rely on dynamic languages. DLTK is comprised of a set of
+extensible frameworks designed to reduce the complexity of building full
+featured development environments for dynamic languages such as PHP and Perl.
+Besides a set of frameworks DLTK provides exemplary Tcl, Ruby, and Python
+Integrated Development Environments ready to use out of the box.
+
+* https://projects.eclipse.org/projects/technology.dltk
+
+## Developer resources
+
+Information regarding source code management, builds, coding standards, and
+more.
+
+* https://projects.eclipse.org/projects/technology.dltk/developer
+
+The project maintains the following source code repositories
+
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.core.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.javascript.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.ruby.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.tcl.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.python.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.sh.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.releng.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.all.git
+
+This project uses Bugzilla to track ongoing development and issues.
+
+* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=DLTK
+* Create a new report: https://eclipse.org/bugs/enter_bug.cgi?product=DLTK
+
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* http://www.eclipse.org/legal/ECA.php
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* https://dev.eclipse.org/mailman/listinfo/dltk-dev
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e23ece2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/NOTICE.md b/NOTICE.md
new file mode 100644
index 0000000..48d5808
--- /dev/null
+++ b/NOTICE.md
@@ -0,0 +1,120 @@
+# Notices for Eclipse Dynamic Languages Toolkit
+
+This content is produced and maintained by the Eclipse Dynamic Languages Toolkit
+project.
+
+* Project home: https://projects.eclipse.org/projects/technology.dltk
+
+## Trademarks
+
+Eclipse Dynamic Languages Toolkit, Dynamic Languages Toolkit, Eclipse DLTK, and
+DLTK are trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.core.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.javascript.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.ruby.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.tcl.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.python.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.sh.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.releng.git
+* http://git.eclipse.org/c/dltk/org.eclipse.dltk.all.git
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ANTLR Runtime (Only) (3.0)
+
+* License: New BSD license
+
+Apache Lucene analyzers-common (7.1.0)
+
+* License: Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause
+
+Apache Lucene Core (7.1.0)
+
+* License: Apache-2.0 AND MIT AND BSD-3-Clause
+
+Apache Lucene Core (7.5)
+
+* License: Apache-2.0 AND MIT AND BSD-3-Clause
+
+Apache Lucene Misc (7.1)
+
+* License: Apache-2.0
+* Project: https://lucene.apache.org/core/
+* Source:
+   https://archive.apache.org/dist/lucene/java/7.1.0/lucene-7.1.0-src.tgz
+
+h2 Database (1.1.117)
+
+* License: Eclipse Public License
+* Project: http://www.h2database.com
+* Source: http://www.h2database.com/html/download.html
+
+h2 Database (1.2.147)
+
+* License: Eclipse Public License
+
+JRuby (0.9.1)
+
+* License: Common Public License 1.0
+
+lucene misc (5.2.1)
+
+* License: Apache License, 2.0
+
+lucene-analyzers-common (5.2.1)
+
+* License: Apache License, 2.0, New BSD license, W3C License
+
+lucene-analyzers-common (6.1.0)
+
+* License: Apache License, 2.0, New BSD license, W3C License	
+
+lucene-core (5.2.1)
+
+* License: Apache License, 2.0, BSD Style, MIT License
+
+lucene-core (6.1.0)
+
+* License: Apache License, 2.0, BSD Style, MIT License
+
+lucene-misc (6.1.0)
+
+* License: Apache License, 2.0
+
+org.apache.xmlbeans (2.3)
+
+* License: Apache License, 2.0
+
+Rhino (1.6)
+
+* License: Netscape Public License 1.1 (NPL)
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
diff --git a/features/org.eclipse.dltk.python-feature/build.properties b/features/org.eclipse.dltk.python-feature/build.properties
index 0b035ff..474db99 100644
--- a/features/org.eclipse.dltk.python-feature/build.properties
+++ b/features/org.eclipse.dltk.python-feature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
@@ -11,10 +13,12 @@
 # * <copyright>
 # *
 # * Copyright (c) 2005 IBM Corporation and others.
-# * All rights reserved.   This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# * This program and the accompanying materials are made available under the
+# * terms of the Eclipse Public License v. 2.0 which is available at
+# * http://www.eclipse.org/legal/epl-2.0.
+# *
+# * SPDX-License-Identifier: EPL-2.0
 # * 
 # 
 # *
diff --git a/features/org.eclipse.dltk.python-feature/feature.properties b/features/org.eclipse.dltk.python-feature/feature.properties
index b6298cb..a6df162 100644
--- a/features/org.eclipse.dltk.python-feature/feature.properties
+++ b/features/org.eclipse.dltk.python-feature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2008 xored software, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # "featureName" property - name of the feature
diff --git a/features/org.eclipse.dltk.python-feature/feature.xml b/features/org.eclipse.dltk.python-feature/feature.xml
index 6620af0..7a23348 100644
--- a/features/org.eclipse.dltk.python-feature/feature.xml
+++ b/features/org.eclipse.dltk.python-feature/feature.xml
@@ -4,10 +4,12 @@
  * <copyright>
  *
  * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *
@@ -27,12 +29,14 @@
       %description
    </description>
 
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
       Copyright (c) 2005, 2006 IBM Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
    </copyright>
 
    <license url="%licenseURL">
diff --git a/features/org.eclipse.dltk.python-feature/rootfiles/notice.html b/features/org.eclipse.dltk.python-feature/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/features/org.eclipse.dltk.python-feature/rootfiles/notice.html
+++ b/features/org.eclipse.dltk.python-feature/rootfiles/notice.html
@@ -21,7 +21,7 @@
 <h3>Applicable Licenses</h3>
 
 <p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/build.properties b/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/build.properties
index a250c6b..4b4acbd 100644
--- a/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/build.properties
+++ b/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/feature.properties
index e17bc47..90ced38 100644
--- a/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # "featureName" property - name of the feature
@@ -52,7 +54,7 @@
 Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
 is provided to you under the terms and conditions of the Eclipse Public\n\
 License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v20.html.\n\
 For purposes of the EPL, "Program" will mean the Content.\n\
 \n\
 Content includes, but is not limited to, source code, object code,\n\
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/license.html b/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index 74122b2..0000000
--- a/features/org.eclipse.dltk.python-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java<sup>TM</sup> ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.html b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.html
index 4c99086..164f781 100644
--- a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.html
+++ b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.html
@@ -1,22 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.properties
index 966ad19..1f0393e 100644
--- a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.properties
+++ b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
@@ -11,10 +13,12 @@
 #  * <copyright>
 #  *
 #  * Copyright (c) 2006 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * This program and the accompanying materials are made available under the
+#  * terms of the Eclipse Public License v. 2.0 which is available at
+#  * http://www.eclipse.org/legal/epl-2.0.
+#  *
+#  * SPDX-License-Identifier: EPL-2.0
 #  *
 #  
 #  *
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/build.properties
index 0ce27b1..6542e04 100644
--- a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/plugin.properties
index dc8924c..0dac9c9 100644
--- a/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/plugin.properties
+++ b/features/org.eclipse.dltk.python-feature/sourceTemplatePlugin/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
@@ -11,10 +13,12 @@
 #  * <copyright>
 #  *
 #  * Copyright (c) 2002, 2006 IBM Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v1.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * This program and the accompanying materials are made available under the
+#  * terms of the Eclipse Public License v. 2.0 which is available at
+#  * http://www.eclipse.org/legal/epl-2.0.
+#  *
+#  * SPDX-License-Identifier: EPL-2.0
 #  *
 #  
 #  *
diff --git a/features/org.eclipse.dltk.python.sdk/build.properties b/features/org.eclipse.dltk.python.sdk/build.properties
index 3bd4db5..19a2412 100644
--- a/features/org.eclipse.dltk.python.sdk/build.properties
+++ b/features/org.eclipse.dltk.python.sdk/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
@@ -11,10 +13,12 @@
 # * <copyright>
 # *
 # * Copyright (c) 2005 IBM Corporation and others.
-# * All rights reserved.   This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
+# *
+# * This program and the accompanying materials are made available under the
+# * terms of the Eclipse Public License v. 2.0 which is available at
+# * http://www.eclipse.org/legal/epl-2.0.
+# *
+# * SPDX-License-Identifier: EPL-2.0
 # * 
 # 
 # *
diff --git a/features/org.eclipse.dltk.python.sdk/feature.properties b/features/org.eclipse.dltk.python.sdk/feature.properties
index 2fa89ea..4a60776 100644
--- a/features/org.eclipse.dltk.python.sdk/feature.properties
+++ b/features/org.eclipse.dltk.python.sdk/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2008 xored software, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # "featureName" property - name of the feature
diff --git a/features/org.eclipse.dltk.python.sdk/rootfiles/notice.html b/features/org.eclipse.dltk.python.sdk/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/features/org.eclipse.dltk.python.sdk/rootfiles/notice.html
+++ b/features/org.eclipse.dltk.python.sdk/rootfiles/notice.html
@@ -21,7 +21,7 @@
 <h3>Applicable Licenses</h3>
 
 <p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
diff --git a/features/org.eclipse.dltk.python.tests/feature.properties b/features/org.eclipse.dltk.python.tests/feature.properties
index 6b37c1a..1b8a743 100644
--- a/features/org.eclipse.dltk.python.tests/feature.properties
+++ b/features/org.eclipse.dltk.python.tests/feature.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
@@ -29,10 +31,12 @@
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
 Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+This program and the accompanying materials are made available under the\n\
+terms of the Eclipse Public License v. 2.0 which is available at\n\
+http://www.eclipse.org/legal/epl-2.0.\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
diff --git a/plugins/org.eclipse.dltk.python.activestatedebugger/plugin.properties b/plugins/org.eclipse.dltk.python.activestatedebugger/plugin.properties
index 7c8ff9a..b031b91 100644
--- a/plugins/org.eclipse.dltk.python.activestatedebugger/plugin.properties
+++ b/plugins/org.eclipse.dltk.python.activestatedebugger/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.java b/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.java
index d5c4652..b4e2723 100644
--- a/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.java
+++ b/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.properties b/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.properties
index 8528805..9385776 100644
--- a/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.properties
+++ b/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PreferenceMessages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PythonActiveStateDebuggerPreferencePage.java b/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PythonActiveStateDebuggerPreferencePage.java
index 379a685..2c321de 100644
--- a/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PythonActiveStateDebuggerPreferencePage.java
+++ b/plugins/org.eclipse.dltk.python.activestatedebugger/src/org/eclipse/dltk/python/activestatedebugger/preferences/PythonActiveStateDebuggerPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
 package org.eclipse.dltk.python.activestatedebugger.preferences;
diff --git a/plugins/org.eclipse.dltk.python.core/about.html b/plugins/org.eclipse.dltk.python.core/about.html
index d4cc693..164f781 100644
--- a/plugins/org.eclipse.dltk.python.core/about.html
+++ b/plugins/org.eclipse.dltk.python.core/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.dltk.python.core/build.properties b/plugins/org.eclipse.dltk.python.core/build.properties
index 6b805fc..32d8ffa 100644
--- a/plugins/org.eclipse.dltk.python.core/build.properties
+++ b/plugins/org.eclipse.dltk.python.core/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.core/plugin.properties b/plugins/org.eclipse.dltk.python.core/plugin.properties
index 0d3056b..429d5b6 100644
--- a/plugins/org.eclipse.dltk.python.core/plugin.properties
+++ b/plugins/org.eclipse.dltk.python.core/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonConstants.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonConstants.java
index 132a94e..e32387e 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonConstants.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonLanguageToolkit.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonLanguageToolkit.java
index c17623e..ed0acc2 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonLanguageToolkit.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonLanguageToolkit.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.core;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonNature.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonNature.java
index 68bae03..9305185 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonNature.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonNature.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonPlugin.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonPlugin.java
index b666991..fc599d0 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonPlugin.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/core/PythonPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.core;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonASTUtil.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonASTUtil.java
index ff534ec..fee765b 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonASTUtil.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonASTUtil.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonAssistParser.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonAssistParser.java
index 8fbee3b..47275d8 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonAssistParser.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonAssistParser.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.codeassist;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionEngine.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionEngine.java
index 36d5286..2ef652d 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionEngine.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionEngine.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.codeassist;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionParser.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionParser.java
index 6676841..089f106 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionParser.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/codeassist/PythonSelectionParser.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.codeassist;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTFindVisitor.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTFindVisitor.java
index 35b68b1..d2e53ff 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTFindVisitor.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTFindVisitor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.evaluation;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTLevelVisitor.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTLevelVisitor.java
index 4875afe..f49e2f9 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTLevelVisitor.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTLevelVisitor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.evaluation;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTTypeEvaluator.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTTypeEvaluator.java
index 20d2746..8a66b40 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonASTTypeEvaluator.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBinaryExpressionOperations.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBinaryExpressionOperations.java
index e27b2ac..a110a69 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBinaryExpressionOperations.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBinaryExpressionOperations.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBuiltIns.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBuiltIns.java
index acf8220..3016821 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBuiltIns.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonBuiltIns.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluator.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluator.java
index 75dbaeb..d6eac75 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluator.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluatorUtils.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluatorUtils.java
index d236cd2..574b5cf 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluatorUtils.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/PythonTypeEvaluatorUtils.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedCallType.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedCallType.java
index 3825649..a391744 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedCallType.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedCallType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.evaluation.types;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedType.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedType.java
index 1da92be..a717724 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedType.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ImportedType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.evaluation.types;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ModuleType.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ModuleType.java
index dd7eab8..50e7886 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ModuleType.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/evaluation/types/ModuleType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.evaluation.types;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParseUtils.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParseUtils.java
index d1baafc..956c309 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParseUtils.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParseUtils.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParserTokenTypes.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParserTokenTypes.java
index 898c857..89fc14c 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParserTokenTypes.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonParserTokenTypes.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonScriptFilteringReader.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonScriptFilteringReader.java
index 964d257..97b87b8 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonScriptFilteringReader.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonScriptFilteringReader.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.parser;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceElementParser.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceElementParser.java
index 3a92402..8bd3037 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceElementParser.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceElementParser.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.parser;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceParser.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceParser.java
index f51e3f1..89c4348 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceParser.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/PythonSourceParser.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.parser;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonSourceElementRequestor.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonSourceElementRequestor.java
index 6ba6422..e5015cb 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonSourceElementRequestor.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonSourceElementRequestor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.parser.visitors;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonVersionReportVisitor.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonVersionReportVisitor.java
index b539dbd..b32a3a8 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonVersionReportVisitor.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/internal/core/parser/visitors/PythonVersionReportVisitor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.core.parser.visitors;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/PythonParserPlugin.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/PythonParserPlugin.java
index e12ebb8..a602d30 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/PythonParserPlugin.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/PythonParserPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
 
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonArgument.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonArgument.java
index bd2c0e3..7619156 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonArgument.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonArgument.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonAssertStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonAssertStatement.java
index 6c22ec8..439755c 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonAssertStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonAssertStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonClassDeclaration.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonClassDeclaration.java
index 0b618fd..653b163 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonClassDeclaration.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonClassDeclaration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonConstants.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonConstants.java
index 20fd312..912f7e2 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonConstants.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonDelStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonDelStatement.java
index f37db3d..d5e9de8 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonDelStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonDelStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonExceptStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonExceptStatement.java
index 2670aa6..6f8c347 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonExceptStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonExceptStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonForStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonForStatement.java
index ac069bb..302cc44 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonForStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonForStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportFromStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportFromStatement.java
index 38f391b..bc9b6e1 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportFromStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportFromStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportStatement.java
index e7502f4..1a70570 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonImportStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonModuleDeclaration.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonModuleDeclaration.java
index ed2e358..a1af0d9 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonModuleDeclaration.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonModuleDeclaration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonRaiseStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonRaiseStatement.java
index 5ac7730..a081966 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonRaiseStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonRaiseStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonTryStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonTryStatement.java
index 36d0afd..4d80ce4 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonTryStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonTryStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonWhileStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonWhileStatement.java
index 5088263..dd6c312 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonWhileStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonWhileStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonYieldStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonYieldStatement.java
index 4f74529..eef184c 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonYieldStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/PythonYieldStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Assignment.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Assignment.java
index 9534d92..39ad01c 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Assignment.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Assignment.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 /*
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/BinaryExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/BinaryExpression.java
index 75ac2df..592d6d1 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/BinaryExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/BinaryExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 /*
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/CallHolder.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/CallHolder.java
index bd35aa7..beaacc6 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/CallHolder.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/CallHolder.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ComplexNumericLiteral.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ComplexNumericLiteral.java
index bd30b55..598819e 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ComplexNumericLiteral.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ComplexNumericLiteral.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Curly.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Curly.java
index 50f8de2..f155977 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Curly.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/Curly.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/EmptyExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/EmptyExpression.java
index fa27f82..149f270 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/EmptyExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/EmptyExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ExtendedVariableReference.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ExtendedVariableReference.java
index b6287ed..170ebae 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ExtendedVariableReference.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ExtendedVariableReference.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 /*
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/IndexHolder.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/IndexHolder.java
index 1347b3b..aaaa1ac 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/IndexHolder.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/IndexHolder.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/InstanceOfExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/InstanceOfExpression.java
index f3e526c..53970b0 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/InstanceOfExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/InstanceOfExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/NotStrictAssignment.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/NotStrictAssignment.java
index 128bd81..f61557c 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/NotStrictAssignment.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/NotStrictAssignment.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 /*
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ParenExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ParenExpression.java
index c4206b2..51d52da 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ParenExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/ParenExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PrintExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PrintExpression.java
index 705c9b3..3a839a4 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PrintExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PrintExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 /*
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonAllImportExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonAllImportExpression.java
index 845d57f..84a1ae0 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonAllImportExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonAllImportExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonDictExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonDictExpression.java
index 641d224..2a08c88 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonDictExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonDictExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonForListExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonForListExpression.java
index 2a0ae19..5f18d07 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonForListExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonForListExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonFunctionDecorator.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonFunctionDecorator.java
index 832577a..6335f3e 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonFunctionDecorator.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonFunctionDecorator.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportAsExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportAsExpression.java
index 4ea29e5..717f112 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportAsExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportAsExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportExpression.java
index 7532c01..f87266e 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonImportExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonLambdaExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonLambdaExpression.java
index 0e1d4ad..343844f 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonLambdaExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonLambdaExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListExpression.java
index f1a4ea3..49a25b1 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListForExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListForExpression.java
index 70d2224..5bb0881 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListForExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonListForExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonSubscriptExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonSubscriptExpression.java
index 424e72a..9ca068d 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonSubscriptExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonSubscriptExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTestListExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTestListExpression.java
index d7d164d..8e6b7d4 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTestListExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTestListExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTupleExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTupleExpression.java
index a084b70..ee26bc4 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTupleExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/PythonTupleExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryExpression.java
index 18326ef..5112173 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.expressions;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryNotExpression.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryNotExpression.java
index 2db151b..1fa9634 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryNotExpression.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/expressions/UnaryNotExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/BreakStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/BreakStatement.java
index d1e3f6c..31b26f1 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/BreakStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/BreakStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/CaseStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/CaseStatement.java
index e98ea57..60b26b5 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/CaseStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/CaseStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ClassicalForStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ClassicalForStatement.java
index db2342c..dcfc4aa 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ClassicalForStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ClassicalForStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ContinueStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ContinueStatement.java
index 15a2e3c..784e589 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ContinueStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ContinueStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/DoWhileStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/DoWhileStatement.java
index cc99b35..cfec03f 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/DoWhileStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/DoWhileStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/EmptyStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/EmptyStatement.java
index 4f69cfa..7c79178 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/EmptyStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/EmptyStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ForEachStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ForEachStatement.java
index 2726b0c..bcb3217 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ForEachStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ForEachStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/IfStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/IfStatement.java
index 3eef85e..3ed7226 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/IfStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/IfStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ReturnStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ReturnStatement.java
index 1358385..4626294 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ReturnStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ReturnStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SimpleStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SimpleStatement.java
index 792b587..e17ebf6 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SimpleStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SimpleStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SwitchStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SwitchStatement.java
index 719aa58..fe1b27e 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SwitchStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/SwitchStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ThrowStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ThrowStatement.java
index deea78e..1abaa99 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ThrowStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/ThrowStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryCatchStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryCatchStatement.java
index b46bfe3..3962794 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryCatchStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryCatchStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryFinallyStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryFinallyStatement.java
index 6fc45df..6d19d79 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryFinallyStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryFinallyStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryStatement.java
index 7f23fb9..c2a705b 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/TryStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/UntilStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/UntilStatement.java
index ce86193..dc66980 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/UntilStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/UntilStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/WhileStatement.java b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/WhileStatement.java
index dccaab2..ba18f9f 100644
--- a/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/WhileStatement.java
+++ b/plugins/org.eclipse.dltk.python.core/src/org/eclipse/dltk/python/parser/ast/statements/WhileStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.parser.ast.statements;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/about.html b/plugins/org.eclipse.dltk.python.debug.ui/about.html
index d4cc693..164f781 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/about.html
+++ b/plugins/org.eclipse.dltk.python.debug.ui/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/build.properties b/plugins/org.eclipse.dltk.python.debug.ui/build.properties
index 56fc2b0..ae685c6 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/build.properties
+++ b/plugins/org.eclipse.dltk.python.debug.ui/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/plugin.properties b/plugins/org.eclipse.dltk.python.debug.ui/plugin.properties
index 07134de..cda18b9 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/plugin.properties
+++ b/plugins/org.eclipse.dltk.python.debug.ui/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugModelPresentation.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugModelPresentation.java
index aa69976..f35bb74 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugModelPresentation.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugModelPresentation.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugUIPlugin.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugUIPlugin.java
index 90534ee..499f897 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugUIPlugin.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/PythonDebugUIPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.java
index e835cfe..718aeee 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.properties b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.properties
index 3315990..61db22a 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.properties
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/ConsoleMessages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonConsoleTracker.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonConsoleTracker.java
index 372f6eb..7e5bab6 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonConsoleTracker.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonConsoleTracker.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.console;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonFileHyperlink.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonFileHyperlink.java
index db28968..65d7c0e 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonFileHyperlink.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/console/PythonFileHyperlink.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.console;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/AddPythonInterpreterDialog.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/AddPythonInterpreterDialog.java
index c61ac1a..0dafc53 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/AddPythonInterpreterDialog.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/AddPythonInterpreterDialog.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.interpreters;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java
index 80513bc..f9a4996 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterLibraryBlock.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterLibraryBlock.java
index 771a1ff..42390c9 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterLibraryBlock.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterLibraryBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.interpreters;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterPreferencePage.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterPreferencePage.java
index 5cfb33d..1481152 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterPreferencePage.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.interpreters;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpretersBlock.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpretersBlock.java
index 635a2f4..e2add97 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpretersBlock.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpretersBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.interpreters;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java
index d96a0db..1969e79 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  ******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.launchConfigurations;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java
index b0c69eb..e9650c6 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.launchConfigurations;
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launcher/PythonLaunchShortcut.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launcher/PythonLaunchShortcut.java
index 497a6ca..edf3306 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launcher/PythonLaunchShortcut.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launcher/PythonLaunchShortcut.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.launcher;
diff --git a/plugins/org.eclipse.dltk.python.debug/plugin.properties b/plugins/org.eclipse.dltk.python.debug/plugin.properties
index eb65cd3..e23a1d7 100644
--- a/plugins/org.eclipse.dltk.python.debug/plugin.properties
+++ b/plugins/org.eclipse.dltk.python.debug/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugConstants.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugConstants.java
index 87d169d..56142db 100644
--- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugConstants.java
+++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java
index e2ceffd..c585a45 100644
--- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java
+++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 
diff --git a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferences.java b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferences.java
index 781afd7..982bac6 100644
--- a/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferences.java
+++ b/plugins/org.eclipse.dltk.python.debug/src/org/eclipse/dltk/python/internal/debug/PythonDebugPreferences.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.launching/about.html b/plugins/org.eclipse.dltk.python.launching/about.html
index d4cc693..164f781 100644
--- a/plugins/org.eclipse.dltk.python.launching/about.html
+++ b/plugins/org.eclipse.dltk.python.launching/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.dltk.python.launching/build.properties b/plugins/org.eclipse.dltk.python.launching/build.properties
index 187a2df..0526d5b 100644
--- a/plugins/org.eclipse.dltk.python.launching/build.properties
+++ b/plugins/org.eclipse.dltk.python.launching/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.launching/plugin.properties b/plugins/org.eclipse.dltk.python.launching/plugin.properties
index 626da3b..c5095fe 100644
--- a/plugins/org.eclipse.dltk.python.launching/plugin.properties
+++ b/plugins/org.eclipse.dltk.python.launching/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.launching/scripts/path.py b/plugins/org.eclipse.dltk.python.launching/scripts/path.py
index 298c9bf..009cbe2 100644
--- a/plugins/org.eclipse.dltk.python.launching/scripts/path.py
+++ b/plugins/org.eclipse.dltk.python.launching/scripts/path.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstall.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstall.java
index 6be7dae..23cdb83 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstall.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstall.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.launching;
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstallType.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstallType.java
index cd0be24..a249f4b 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstallType.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/GenericPythonInstallType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.launching;
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterMessages.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterMessages.java
index 7c0e1df..6360389 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterMessages.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterMessages.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterRunner.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterRunner.java
index 9072441..f63574c 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterRunner.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/internal/launching/PythonInterpreterRunner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.launching;
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationConstants.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationConstants.java
index fd3d24a..8b08a33 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationConstants.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationDelegate.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationDelegate.java
index 7fd75c7..1d9cf8d 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchConfigurationDelegate.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.launching;
diff --git a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchingPlugin.java b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchingPlugin.java
index 02382ae..f33bbeb 100644
--- a/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchingPlugin.java
+++ b/plugins/org.eclipse.dltk.python.launching/src/org/eclipse/dltk/python/launching/PythonLaunchingPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.launching;
diff --git a/plugins/org.eclipse.dltk.python.ui/about.html b/plugins/org.eclipse.dltk.python.ui/about.html
index d4cc693..164f781 100644
--- a/plugins/org.eclipse.dltk.python.ui/about.html
+++ b/plugins/org.eclipse.dltk.python.ui/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.dltk.python.ui/build.properties b/plugins/org.eclipse.dltk.python.ui/build.properties
index 5775c73..ec4df1d 100644
--- a/plugins/org.eclipse.dltk.python.ui/build.properties
+++ b/plugins/org.eclipse.dltk.python.ui/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.ui/plugin.properties b/plugins/org.eclipse.dltk.python.ui/plugin.properties
index b48840d..4b904e8 100644
--- a/plugins/org.eclipse.dltk.python.ui/plugin.properties
+++ b/plugins/org.eclipse.dltk.python.ui/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonImages.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonImages.java
index bdbad96..f0d12a4 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonImages.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonImages.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUI.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUI.java
index 946331e..36e4517 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUI.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUI.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUILanguageToolkit.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUILanguageToolkit.java
index b1ba893..2d81787 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUILanguageToolkit.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUILanguageToolkit.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUIPreferenceInitializer.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUIPreferenceInitializer.java
index 20b30d7..e2c9daa 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUIPreferenceInitializer.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/PythonUIPreferenceInitializer.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.java
index 155c982..80ca862 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.properties b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.properties
index 1cfa820..074682e 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.properties
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/ActionMessages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 #     Sebastian Davids <sdavids@gmx.de> - Bug 114276
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonDocumentSetupParticipant.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonDocumentSetupParticipant.java
index fb41e86..78b4bcc 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonDocumentSetupParticipant.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonDocumentSetupParticipant.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.editor;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonEditor.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonEditor.java
index 047eb7c..53b7a0a 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonEditor.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonEditor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.editor;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonOutlinePage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonOutlinePage.java
index ab91b07..508b147 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonOutlinePage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/editor/PythonOutlinePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.editor;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathPropertyPage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathPropertyPage.java
index 3a9dfe5..b52485c 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathPropertyPage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathPropertyPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.preferences;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathsBlock.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathsBlock.java
index 2e4f7cd..528dfe2 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathsBlock.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonBuildPathsBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorColoringConfigurationBlock.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorColoringConfigurationBlock.java
index ce29e1c..8f44fd5 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorColoringConfigurationBlock.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorColoringConfigurationBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.preferences;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorPreferencesPage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorPreferencesPage.java
index 6d72901..742e4e8 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorPreferencesPage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorPreferencesPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.preferences;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorSyntaxColoringPreferencePage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorSyntaxColoringPreferencePage.java
index 9d97abd..bd9e5e0 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorSyntaxColoringPreferencePage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonEditorSyntaxColoringPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.preferences;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonFoldingPreferencePage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonFoldingPreferencePage.java
index b5359df..59d90be 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonFoldingPreferencePage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonFoldingPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalConfigurationBlock.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalConfigurationBlock.java
index 6f96463..a479e1f 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalConfigurationBlock.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalConfigurationBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.preferences;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalPreferencesPage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalPreferencesPage.java
index 415fb51..a9ef44c 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalPreferencesPage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonGlobalPreferencesPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.preferences;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonPreferencesMessages.properties b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonPreferencesMessages.properties
index 920e65d..62ebdfb 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonPreferencesMessages.properties
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonPreferencesMessages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 ###############################################################################
 
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingConfigurationBlock.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingConfigurationBlock.java
index 829a48a..e17014a 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingConfigurationBlock.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingConfigurationBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingPreferencePage.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingPreferencePage.java
index 8acd149..d57c5bd 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingPreferencePage.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/preferences/PythonSmartTypingPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/rules/PythonFloatNumberRule.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/rules/PythonFloatNumberRule.java
index 26e837e..93879af 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/rules/PythonFloatNumberRule.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/rules/PythonFloatNumberRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.rules;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonAutoEditStrategy.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonAutoEditStrategy.java
index c40e24c..d49ebec 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonAutoEditStrategy.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonAutoEditStrategy.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonCodeScanner.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonCodeScanner.java
index aa148a0..80f0da3 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonCodeScanner.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonCodeScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonColorConstants.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonColorConstants.java
index 1e51664..e062bf7 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonColorConstants.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonColorConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonDecoratorDetector.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonDecoratorDetector.java
index ecd01a5..6416d7f 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonDecoratorDetector.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonDecoratorDetector.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonPartitionScanner.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonPartitionScanner.java
index e6f4144..6ffcd8f 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonPartitionScanner.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonPartitionScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonSourceViewerConfiguration.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonSourceViewerConfiguration.java
index c58462d..9ca60cc 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonSourceViewerConfiguration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonStringScanner.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonStringScanner.java
index 690691b..86e2ec4 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonStringScanner.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonStringScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonTextTools.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonTextTools.java
index dd08d9c..a7366bd 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonTextTools.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonTextTools.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWhitespaceDetector.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWhitespaceDetector.java
index 6421e4a..7db5a94 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWhitespaceDetector.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWhitespaceDetector.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWordDetector.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWordDetector.java
index 8021393..b3d9720 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWordDetector.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/PythonWordDetector.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/SimplePythonSourceViewerConfiguration.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/SimplePythonSourceViewerConfiguration.java
index 6bf7678..92164ac 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/SimplePythonSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/SimplePythonSourceViewerConfiguration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingPreferenceBlock.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingPreferenceBlock.java
index b3252be..52cf229 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingPreferenceBlock.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingPreferenceBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingStructureProvider.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingStructureProvider.java
index 4ab928d..9cefd24 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingStructureProvider.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/text/folding/PythonFoldingStructureProvider.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.text.folding;
 
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonProjectCreationWizard.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonProjectCreationWizard.java
index 2246450..bf3d324 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonProjectCreationWizard.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonProjectCreationWizard.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.ui.wizards;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.java
index 573a743..0c6df05 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.properties b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.properties
index 3b0bc9d..0635a66 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.properties
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/internal/ui/wizards/PythonWizardMessages.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPerspective.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPerspective.java
index 1a11748..4e56e0e 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPerspective.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPerspective.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.ui;
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPreferenceConstants.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPreferenceConstants.java
index e4dfb20..cda3999 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPreferenceConstants.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/PythonPreferenceConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/text/IPythonPartitions.java b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/text/IPythonPartitions.java
index 69463f5..bf470a0 100644
--- a/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/text/IPythonPartitions.java
+++ b/plugins/org.eclipse.dltk.python.ui/src/org/eclipse/dltk/python/ui/text/IPythonPartitions.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.tests/about.html b/tests/org.eclipse.dltk.python.tests/about.html
index d4cc693..164f781 100644
--- a/tests/org.eclipse.dltk.python.tests/about.html
+++ b/tests/org.eclipse.dltk.python.tests/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/org.eclipse.dltk.python.tests/build.properties b/tests/org.eclipse.dltk.python.tests/build.properties
index 14c5fbb..1aa96e6 100644
--- a/tests/org.eclipse.dltk.python.tests/build.properties
+++ b/tests/org.eclipse.dltk.python.tests/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/plugin.properties b/tests/org.eclipse.dltk.python.tests/plugin.properties
index 4fd93a8..1482220 100644
--- a/tests/org.eclipse.dltk.python.tests/plugin.properties
+++ b/tests/org.eclipse.dltk.python.tests/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/scripts/make_ast_model_tests.py b/tests/org.eclipse.dltk.python.tests/scripts/make_ast_model_tests.py
index 58b2382..a478c4d 100644
--- a/tests/org.eclipse.dltk.python.tests/scripts/make_ast_model_tests.py
+++ b/tests/org.eclipse.dltk.python.tests/scripts/make_ast_model_tests.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/scripts/model_test_maker.py b/tests/org.eclipse.dltk.python.tests/scripts/model_test_maker.py
index 3a7bf29..eaf3fbf 100644
--- a/tests/org.eclipse.dltk.python.tests/scripts/model_test_maker.py
+++ b/tests/org.eclipse.dltk.python.tests/scripts/model_test_maker.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/AllTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/AllTests.java
index 2e65ecf..d7c7dd4 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/AllTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/PythonTestsPlugin.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/PythonTestsPlugin.java
index 42005a3..502087b 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/PythonTestsPlugin.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/PythonTestsPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/buildpath/BuildpathTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/buildpath/BuildpathTests.java
index 4029a97..004cbec 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/buildpath/BuildpathTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/buildpath/BuildpathTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.buildpath;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/eval/generated/AllTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/eval/generated/AllTests.java
index 6c5b292..cb4902c 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/eval/generated/AllTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/eval/generated/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/AllPythonModelTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/AllPythonModelTests.java
index 0c95b6a..5e379b5 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/AllPythonModelTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/AllPythonModelTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveElementsTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveElementsTests.java
index 91e1a7b..f60a9f2 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveElementsTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveElementsTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveResourcesTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveResourcesTests.java
index 1d7fcc3..f648a13 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveResourcesTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/CopyMoveResourcesTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteResourcesTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteResourcesTests.java
index 84c015b..7c4cece 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteResourcesTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteResourcesTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteTests.java
index c2d002b..1cb4050 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/DeleteTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/EncodingTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/EncodingTests.java
index 0b2deae..593557e 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/EncodingTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/EncodingTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ExclusionPatternsTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ExclusionPatternsTests.java
index 3698748..61bc622 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ExclusionPatternsTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ExclusionPatternsTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ModelPythonTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ModelPythonTests.java
index 722d352..d2dbc6a 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ModelPythonTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/ModelPythonTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/TestProgressMonitor.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/TestProgressMonitor.java
index 1ce71a7..0ed5da8 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/TestProgressMonitor.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/TestProgressMonitor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/WorkingCopyTests.java b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/WorkingCopyTests.java
index 94a8d53..0c2d46b 100644
--- a/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/WorkingCopyTests.java
+++ b/tests/org.eclipse.dltk.python.tests/src/org/eclipse/dltk/python/tests/model/WorkingCopyTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.tests.model;
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_generator.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_generator.py
index 51b0a4b..1378c94 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_generator.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_generator.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_module0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_module0.py
index 42ca6a8..b9d63c6 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_module0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_module0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_simple.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_simple.py
index 2de933d..f863d37 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_simple.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_simple.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_utils.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_utils.py
index 6da19ef..a1ab695 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_utils.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/_utils.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/binops.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/binops.py
index 810a5b4..9e9bebc 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/binops.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/binops.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class0.py
index 74f7578..a1e95dc 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class1.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class1.py
index c1f1b7a..1f2805e 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class1.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class1.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class2.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class2.py
index bd9cd21..bd131f1 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class2.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class2.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class_import0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class_import0.py
index 958cf2d..9cb5ffb 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class_import0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/class_import0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/fromimport0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/fromimport0.py
index 35ec2d6..c579735 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/fromimport0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/fromimport0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/func0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/func0.py
index 2926d78..402fc0d 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/func0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/func0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import0.py
index dda1367..6b7abb7 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import1.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import1.py
index 5c5d184..5b8a38f 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import1.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/import1.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/method0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/method0.py
index fe9114a..eaf75c7 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/method0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/method0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/__init__.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/__init__.py
index 8d9ffc8..38fd8ea 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/__init__.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/__init__.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/class0.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/class0.py
index 4173ab7..70b8840 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/class0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/class0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/module.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/module.py
index 636de55..fd38260 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/module.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/module.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/__init__.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/__init__.py
index 92268b7..b232f32 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/__init__.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/__init__.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/module.py b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/module.py
index c119119..37077e5 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/module.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/eval0/src/pkg/pkg2/module.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/model0/X.py b/tests/org.eclipse.dltk.python.tests/workspace/model0/X.py
index 37c017b..b043553 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/model0/X.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/model0/X.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/model0/src/X.py b/tests/org.eclipse.dltk.python.tests/workspace/model0/src/X.py
index 37c017b..b043553 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/model0/src/X.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/model0/src/X.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.tests/workspace/prj0/src/module0.py b/tests/org.eclipse.dltk.python.tests/workspace/prj0/src/module0.py
index ab97320..9a70665 100644
--- a/tests/org.eclipse.dltk.python.tests/workspace/prj0/src/module0.py
+++ b/tests/org.eclipse.dltk.python.tests/workspace/prj0/src/module0.py
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.ui.tests/about.html b/tests/org.eclipse.dltk.python.ui.tests/about.html
index d4cc693..164f781 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/about.html
+++ b/tests/org.eclipse.dltk.python.ui.tests/about.html
@@ -2,27 +2,35 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>About</title>
 </head>
 <body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
+	<h2>About This Content</h2>
 
-<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>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+	<p>November 30, 2017</p>
+	<h3>License</h3>
 
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/org.eclipse.dltk.python.ui.tests/build.properties b/tests/org.eclipse.dltk.python.ui.tests/build.properties
index e423477..1171ec7 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/build.properties
+++ b/tests/org.eclipse.dltk.python.ui.tests/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.ui.tests/plugin.properties b/tests/org.eclipse.dltk.python.ui.tests/plugin.properties
index 50e105e..1597150 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/plugin.properties
+++ b/tests/org.eclipse.dltk.python.ui.tests/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ###############################################################################
diff --git a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/AllTests.java b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/AllTests.java
index 0de99b9..d9e22c5 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/AllTests.java
+++ b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/PythonUITestsPlugin.java b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/PythonUITestsPlugin.java
index 82bfae5..ff9a6e2 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/PythonUITestsPlugin.java
+++ b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/PythonUITestsPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.ui.tests;
diff --git a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/AllTests.java b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/AllTests.java
index 45f1d05..ed322ba 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/AllTests.java
+++ b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/DocCmd.java b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/DocCmd.java
index 0a74e5e..d2d5420 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/DocCmd.java
+++ b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/DocCmd.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  
  *******************************************************************************/
diff --git a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/PyAutoIndentStrategyTest.java b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/PyAutoIndentStrategyTest.java
index 64b1568..2af6069 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/PyAutoIndentStrategyTest.java
+++ b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/PyAutoIndentStrategyTest.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.ui.tests.indenting;
diff --git a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/SimpleIndentingTest.java b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/SimpleIndentingTest.java
index c1a71a5..bb4351d 100644
--- a/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/SimpleIndentingTest.java
+++ b/tests/org.eclipse.dltk.python.ui.tests/src/org/eclipse/dltk/python/ui/tests/indenting/SimpleIndentingTest.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ * 
+ * SPDX-License-Identifier: EPL-2.0
  *
  *******************************************************************************/
 package org.eclipse.dltk.python.ui.tests.indenting;