Bug 536315 - Re-license to EPL-2.0

Signed-off-by: Dawid Pakuła <zulus@w3des.net>
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/itcl/features/org.eclipse.dltk.itcl-feature/build.properties b/itcl/features/org.eclipse.dltk.itcl-feature/build.properties
index 37f85e2..7938450 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/build.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-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
 #
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
diff --git a/itcl/features/org.eclipse.dltk.itcl-feature/feature.properties b/itcl/features/org.eclipse.dltk.itcl-feature/feature.properties
index b338f1f..4fc205f 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/feature.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-feature/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
diff --git a/itcl/features/org.eclipse.dltk.itcl-feature/feature.xml b/itcl/features/org.eclipse.dltk.itcl-feature/feature.xml
index 263d905..e4642d4 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/feature.xml
+++ b/itcl/features/org.eclipse.dltk.itcl-feature/feature.xml
@@ -4,10 +4,12 @@
  * <copyright>
  *
  * 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
  *
  *
  * </copyright>
@@ -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, 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
    </copyright>
 
    <license url="%licenseURL">
diff --git a/itcl/features/org.eclipse.dltk.itcl-feature/rootfiles/notice.html b/itcl/features/org.eclipse.dltk.itcl-feature/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/rootfiles/notice.html
+++ b/itcl/features/org.eclipse.dltk.itcl-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/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/build.properties b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/build.properties
index a250c6b..4b4acbd 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/build.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-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/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/feature.properties b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/feature.properties
index ea5e9e7..1d5446b 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/feature.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-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
 #
 
 ###############################################################################
@@ -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
 #  * 
 #  
 #  *
@@ -83,7 +87,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/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/license.html b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index 79bd185..0000000
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>Eclipse DLTK Core Frameworks License</title>
-</head>
-<body lang="EN-US">
-<h1>Eclipse DLTK Core Frameworks License</h1><h3>June 5, 2008</h3>
-<ul>
-	<li>Eclipse Public License v1.0 (<a href="#epl">http://www.eclipse.org/legal/epl-v10.html</a>) for Eclipse DLTK Core Frameworks</li>
-</ul>
-
-<hr>
-
-<div name="epl" lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/about.html b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/about.html
index 7c8477f..164f781 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/about.html
+++ b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/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, 2008</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/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/about.properties b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/about.properties
index 391e60f..e0bc261 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/about.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-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/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/build.properties b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/build.properties
index 2a3a91c..3ae0bc7 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/build.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-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/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/plugin.properties b/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/plugin.properties
index 82362c4..1429d65 100644
--- a/itcl/features/org.eclipse.dltk.itcl-feature/sourceTemplatePlugin/plugin.properties
+++ b/itcl/features/org.eclipse.dltk.itcl-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/itcl/features/org.eclipse.dltk.itcl.sdk/build.properties b/itcl/features/org.eclipse.dltk.itcl.sdk/build.properties
index 97729b4..621bbf9 100644
--- a/itcl/features/org.eclipse.dltk.itcl.sdk/build.properties
+++ b/itcl/features/org.eclipse.dltk.itcl.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/itcl/features/org.eclipse.dltk.itcl.sdk/feature.properties b/itcl/features/org.eclipse.dltk.itcl.sdk/feature.properties
index 602602d..1a85fb5 100644
--- a/itcl/features/org.eclipse.dltk.itcl.sdk/feature.properties
+++ b/itcl/features/org.eclipse.dltk.itcl.sdk/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
diff --git a/itcl/features/org.eclipse.dltk.itcl.sdk/rootfiles/notice.html b/itcl/features/org.eclipse.dltk.itcl.sdk/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/itcl/features/org.eclipse.dltk.itcl.sdk/rootfiles/notice.html
+++ b/itcl/features/org.eclipse.dltk.itcl.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/itcl/features/org.eclipse.dltk.itcl.tests-feature/feature.properties b/itcl/features/org.eclipse.dltk.itcl.tests-feature/feature.properties
index dff6c04..e86ac03 100644
--- a/itcl/features/org.eclipse.dltk.itcl.tests-feature/feature.properties
+++ b/itcl/features/org.eclipse.dltk.itcl.tests-feature/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/itcl/plugins/org.eclipse.dltk.itcl.core/about.html b/itcl/plugins/org.eclipse.dltk.itcl.core/about.html
index 7c8477f..164f781 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/about.html
+++ b/itcl/plugins/org.eclipse.dltk.itcl.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, 2008</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/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/classes/IncrTclClassesManager.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/classes/IncrTclClassesManager.java
index 5111b42..acea996 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/classes/IncrTclClassesManager.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/classes/IncrTclClassesManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/ast/IncrTclBodyDeclaration.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/ast/IncrTclBodyDeclaration.java
index b0b13f5..e7bb55c 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/ast/IncrTclBodyDeclaration.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/ast/IncrTclBodyDeclaration.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/CommandImpl.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/CommandImpl.java
index 4436901..495c967 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/CommandImpl.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/CommandImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/ICommand.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/ICommand.java
index 0056028..d770993 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/ICommand.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/ICommand.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclBody.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclBody.java
index f6cef5a..cfbfccf 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclBody.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclBody.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclClass.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclClass.java
index 79cd4db..0dab946 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclClass.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclClass.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclModelDetector.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclModelDetector.java
index 45ba9d1..927ce62 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclModelDetector.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclModelDetector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNames.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNames.java
index ae45e00..8363af2 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNames.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNames.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNewInstance.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNewInstance.java
index ac8bf54..652666d 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNewInstance.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/IncrTclNewInstance.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/PrefixedCommandImpl.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/PrefixedCommandImpl.java
index af033f0..8dd2400 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/PrefixedCommandImpl.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/PrefixedCommandImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IClass.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IClass.java
index ce1c212..7488094 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IClass.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IClass.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMember.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMember.java
index c09ba8b..ddf1a57 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMember.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMember.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMethod.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMethod.java
index 7160b40..c331498 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMethod.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IMethod.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IRange.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IRange.java
index bdba9c8..45270b2 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IRange.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IRange.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IVariable.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IVariable.java
index 1264931..0c5f297 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IVariable.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/IVariable.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/ClassImpl.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/ClassImpl.java
index 4be03d4..84ad414 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/ClassImpl.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/ClassImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Member.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Member.java
index e2b38b2..d3e4050 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Member.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Member.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Method.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Method.java
index d0ca917..87e7cab 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Method.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Method.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Variable.java b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Variable.java
index 2ffb95e..3696279 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Variable.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.core/src/org/eclipse/dltk/itcl/internal/core/parser/structure/model/impl/Variable.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/plugins/org.eclipse.dltk.itcl.ui/about.html b/itcl/plugins/org.eclipse.dltk.itcl.ui/about.html
index 7c8477f..164f781 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.ui/about.html
+++ b/itcl/plugins/org.eclipse.dltk.itcl.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, 2008</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/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclNewFileWizard.java b/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclNewFileWizard.java
index bff5378..23361cc 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclNewFileWizard.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclNewFileWizard.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/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.java b/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.java
index eefc641..695673d 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.java
+++ b/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.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/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.properties b/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.properties
index 89a20d4..a16bd6f 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.properties
+++ b/itcl/plugins/org.eclipse.dltk.itcl.ui/src/org/eclipse/dltk/itcl/internal/ui/wizards/IncrTclWizardMessages.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/itcl/plugins/org.eclipse.dltk.itcl/about.html b/itcl/plugins/org.eclipse.dltk.itcl/about.html
index 7c8477f..164f781 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl/about.html
+++ b/itcl/plugins/org.eclipse.dltk.itcl/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, 2008</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/itcl/plugins/org.eclipse.dltk.itcl/about.properties b/itcl/plugins/org.eclipse.dltk.itcl/about.properties
index e3f96b3..bf49d47 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl/about.properties
+++ b/itcl/plugins/org.eclipse.dltk.itcl/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/itcl/plugins/org.eclipse.dltk.itcl/plugin.properties b/itcl/plugins/org.eclipse.dltk.itcl/plugin.properties
index 1d95e30..bcb03af 100644
--- a/itcl/plugins/org.eclipse.dltk.itcl/plugin.properties
+++ b/itcl/plugins/org.eclipse.dltk.itcl/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/AllTests.java b/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/AllTests.java
index ba2fd78..b665d51 100644
--- a/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/AllTests.java
+++ b/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.itcl.core.tests;
diff --git a/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/ITclTestsPlugin.java b/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/ITclTestsPlugin.java
index 66a38c0..ba88144 100644
--- a/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/ITclTestsPlugin.java
+++ b/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/ITclTestsPlugin.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/internal/ITclParseTests.java b/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/internal/ITclParseTests.java
index 4449d65..40a33a3 100644
--- a/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/internal/ITclParseTests.java
+++ b/itcl/tests/org.eclipse.dltk.itcl.core.tests/src/org/eclipse/dltk/itcl/core/tests/internal/ITclParseTests.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/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.html b/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.html
index 80b00cf..164f781 100644
--- a/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.html
+++ b/tcl/docs/org.eclipse.dltk.tcl.doc.user/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>October 16, 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/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.properties b/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.properties
index 4f3adf5..da9a2a5 100644
--- a/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.properties
+++ b/tcl/docs/org.eclipse.dltk.tcl.doc.user/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tcl/docs/org.eclipse.dltk.tcl.doc.user/plugin.properties b/tcl/docs/org.eclipse.dltk.tcl.doc.user/plugin.properties
index 7bce603..a7b0a8c 100644
--- a/tcl/docs/org.eclipse.dltk.tcl.doc.user/plugin.properties
+++ b/tcl/docs/org.eclipse.dltk.tcl.doc.user/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/build.properties b/tcl/features/org.eclipse.dltk.tcl-feature/build.properties
index 37f85e2..7938450 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/build.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-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
 #
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/feature.properties b/tcl/features/org.eclipse.dltk.tcl-feature/feature.properties
index 6056124..a22b7b8 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/feature.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-feature/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
diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/feature.xml b/tcl/features/org.eclipse.dltk.tcl-feature/feature.xml
index f9bdbc8..1b6d023 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/feature.xml
+++ b/tcl/features/org.eclipse.dltk.tcl-feature/feature.xml
@@ -4,10 +4,12 @@
  * <copyright>
  *
  * 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
  *
  *
  * </copyright>
@@ -26,12 +28,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, 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
    </copyright>
 
    <license url="%licenseURL">
diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/notice.html b/tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/rootfiles/notice.html
+++ b/tcl/features/org.eclipse.dltk.tcl-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/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/build.properties b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/build.properties
index a250c6b..4b4acbd 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/build.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-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/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/feature.properties b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/feature.properties
index d3bca33..0effa78 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/feature.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-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/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/license.html b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index 79bd185..0000000
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>Eclipse DLTK Core Frameworks License</title>
-</head>
-<body lang="EN-US">
-<h1>Eclipse DLTK Core Frameworks License</h1><h3>June 5, 2008</h3>
-<ul>
-	<li>Eclipse Public License v1.0 (<a href="#epl">http://www.eclipse.org/legal/epl-v10.html</a>) for Eclipse DLTK Core Frameworks</li>
-</ul>
-
-<hr>
-
-<div name="epl" lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/about.html b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/about.html
index 7c8477f..164f781 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/about.html
+++ b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/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, 2008</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/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/about.properties b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/about.properties
index 922d042..d6b8158 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/about.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-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/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/build.properties b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/build.properties
index 2a3a91c..3ae0bc7 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/build.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-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/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/plugin.properties b/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/plugin.properties
index b1bc95f..815cbcf 100644
--- a/tcl/features/org.eclipse.dltk.tcl-feature/sourceTemplatePlugin/plugin.properties
+++ b/tcl/features/org.eclipse.dltk.tcl-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/tcl/features/org.eclipse.dltk.tcl.sdk/build.properties b/tcl/features/org.eclipse.dltk.tcl.sdk/build.properties
index 79b1695..7392474 100644
--- a/tcl/features/org.eclipse.dltk.tcl.sdk/build.properties
+++ b/tcl/features/org.eclipse.dltk.tcl.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/tcl/features/org.eclipse.dltk.tcl.sdk/feature.properties b/tcl/features/org.eclipse.dltk.tcl.sdk/feature.properties
index b983d52..659f2ae 100644
--- a/tcl/features/org.eclipse.dltk.tcl.sdk/feature.properties
+++ b/tcl/features/org.eclipse.dltk.tcl.sdk/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
diff --git a/tcl/features/org.eclipse.dltk.tcl.sdk/rootfiles/notice.html b/tcl/features/org.eclipse.dltk.tcl.sdk/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/tcl/features/org.eclipse.dltk.tcl.sdk/rootfiles/notice.html
+++ b/tcl/features/org.eclipse.dltk.tcl.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/tcl/features/org.eclipse.dltk.tcl.tests-feature/feature.properties b/tcl/features/org.eclipse.dltk.tcl.tests-feature/feature.properties
index a1b7e78..c7ac486 100644
--- a/tcl/features/org.eclipse.dltk.tcl.tests-feature/feature.properties
+++ b/tcl/features/org.eclipse.dltk.tcl.tests-feature/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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/about.html b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerPattern.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerPattern.java
index 7c1eafc..e5a689b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerPattern.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerPattern.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerType.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerType.java
index df4322d..7281db4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ContainerType.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationConfig.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationConfig.java
index 2937b0f..6dc8c00 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationConfig.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationConfig.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationMode.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationMode.java
index 8753631..e67eb7e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationMode.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationMode.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryPattern.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryPattern.java
index 4cfbbb6..97a55ce 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryPattern.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryPattern.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ModelElementPattern.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ModelElementPattern.java
index 4bedef4..dcbcafd 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ModelElementPattern.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/ModelElementPattern.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackagePattern.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackagePattern.java
index 150061c..efe8cc7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackagePattern.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackagePattern.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/Pattern.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/Pattern.java
index 07b5d33..9e9c900 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/Pattern.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/Pattern.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesFactory.java
index 76e9f7c..ff6e9fc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesFactory.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesPackage.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesPackage.java
index 4848858..20039d6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesPackage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferencesPackage.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourcePattern.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourcePattern.java
index 2e5f74b..3e28951 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourcePattern.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourcePattern.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ContainerPatternImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ContainerPatternImpl.java
index a7452b9..ea02803 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ContainerPatternImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ContainerPatternImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/InstrumentationConfigImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/InstrumentationConfigImpl.java
index 04da9f4..3ded088 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/InstrumentationConfigImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/InstrumentationConfigImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/LibraryPatternImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/LibraryPatternImpl.java
index fb765f5..74f388c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/LibraryPatternImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/LibraryPatternImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ModelElementPatternImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ModelElementPatternImpl.java
index 98a2749..54b9959 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ModelElementPatternImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/ModelElementPatternImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PackagePatternImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PackagePatternImpl.java
index bac3cd5..fd8e257 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PackagePatternImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PackagePatternImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PatternImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PatternImpl.java
index 28ff9b1..951d7e4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PatternImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PatternImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesFactoryImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesFactoryImpl.java
index 81b57a4..8a68e85 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesFactoryImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesFactoryImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesPackageImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesPackageImpl.java
index 154947c..30aefd5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesPackageImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/PreferencesPackageImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/SourcePatternImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/SourcePatternImpl.java
index e59f9a6..0ac47c3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/SourcePatternImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/impl/SourcePatternImpl.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesAdapterFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesAdapterFactory.java
index a353957..62b66a9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesAdapterFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesAdapterFactory.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesSwitch.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesSwitch.java
index 05c4ff9..de2a31f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesSwitch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/gensrc/org/eclipse/dltk/tcl/activestatedebugger/preferences/util/PreferencesSwitch.java
@@ -1,10 +1,11 @@
 /**
  * Copyright (c) 2008 xored software, Inc.  
  * 
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/models/activestatedebugger.genmodel b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/models/activestatedebugger.genmodel
index c4c547a..d140172 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/models/activestatedebugger.genmodel
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/models/activestatedebugger.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008 xored software, Inc.  &#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html  &#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    xored software, Inc. - initial API and Implementation (Alex Panchenko)&#xD;&#xA;"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008 xored software, Inc.  &#xD;&#xA;&#xD;&#xA;This program and the accompanying materials are made available under the&#xA;terms of the Eclipse Public License v. 2.0 which is available at&#xA;http://www.eclipse.org/legal/epl-2.0.&#xA;&#xA;SPDX-License-Identifier: EPL-2.0&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    xored software, Inc. - initial API and Implementation (Alex Panchenko)&#xD;&#xA;"
     modelDirectory="/org.eclipse.dltk.tcl.activestatedebugger/gensrc" modelPluginID="org.eclipse.dltk.tcl.activestatedebugger"
     templateDirectory="" redirection="" modelName="Activestatedebugger" modelPluginClass=""
     nonNLSMarkers="true" rootImplementsInterface="" booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore"
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/plugin.properties
index e849cd3..9b422c1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ActiveStateInstrumentCommands.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ActiveStateInstrumentCommands.java
index 94591d0..334dc15 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ActiveStateInstrumentCommands.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ActiveStateInstrumentCommands.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ErrorAction.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ErrorAction.java
index 8919898..c9e7a5f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ErrorAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ErrorAction.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ITclActiveStateDebuggerEnvironment.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ITclActiveStateDebuggerEnvironment.java
index 9097582..463617b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ITclActiveStateDebuggerEnvironment.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/ITclActiveStateDebuggerEnvironment.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationConfigProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationConfigProcessor.java
index 26a5b4c..27ecb31 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationConfigProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationConfigProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationFeature.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationFeature.java
index 24fe3e9..251cec4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationFeature.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationFeature.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationSetup.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationSetup.java
index 6b96a2f..3fefff9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationSetup.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationSetup.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationUtils.java
index 4f44408..aaca5bf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/InstrumentationUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/Messages.java
index 77dc267..0ef7919 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateCommandRenameFilter.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateCommandRenameFilter.java
index ffe5193..0fb0630 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateCommandRenameFilter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateCommandRenameFilter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebugThreadConfigurator.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebugThreadConfigurator.java
index da6f81a..ed3bd22 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebugThreadConfigurator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebugThreadConfigurator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerConstants.java
index d67c155..7ff33c4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerConstants.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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerPlugin.java
index 6c728c4..e3f939c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerPlugin.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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunner.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunner.java
index 30a251d..af0444b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunner.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.tcl.activestatedebugger;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunnerFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunnerFactory.java
index 6024827..6a2fe77 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunnerFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/TclActiveStateDebuggerRunnerFactory.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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationContentProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationContentProvider.java
index 16bd873..b2fb76e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationContentProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationContentProvider.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationLabelProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationLabelProvider.java
index 458bf1e..ec74af0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationLabelProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationLabelProvider.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
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternComparator.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternComparator.java
index 5f24960..7580fab 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternComparator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternComparator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternList.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternList.java
index a7755f3..78c3a4a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternList.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/InstrumentationPatternList.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryContainerElement.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryContainerElement.java
index 9a07e45..20b8711 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryContainerElement.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/LibraryContainerElement.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackageElement.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackageElement.java
index d6eeacd..701b5ba 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackageElement.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PackageElement.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PatternListIO.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PatternListIO.java
index 0302161..da7fb2b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PatternListIO.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PatternListIO.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferenceMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferenceMessages.java
index ece7079..1ac737c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferenceMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferenceMessages.properties b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferenceMessages.properties
index 180f952..fd1d24a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/PreferenceMessages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/ProjectSelectionDialogInput.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/ProjectSelectionDialogInput.java
index 21b291c..0d377c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/ProjectSelectionDialogInput.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/ProjectSelectionDialogInput.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogComparator.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogComparator.java
index f7e5b12..d33bdb0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogComparator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogComparator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogInput.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogInput.java
index ea5380b..1b0f94b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogInput.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SelectionDialogInput.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourceElement.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourceElement.java
index f47f5a8..2caf0e2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourceElement.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/SourceElement.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerBlock.java
index 10518ed..d6026a8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerEnvironment.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerEnvironment.java
index 7e10c2c..c702f39 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerEnvironment.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerEnvironment.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerPreferencePage.java
index e22e4ea..7a023c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclActiveStateDebuggerPreferencePage.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/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclLoggingPathBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclLoggingPathBlock.java
index 4b33820..cf9e409 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclLoggingPathBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclLoggingPathBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclSpawnpointPreferenceBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclSpawnpointPreferenceBlock.java
index 4e21bdb..0b1a69b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclSpawnpointPreferenceBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TclSpawnpointPreferenceBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TreeSelectionControl.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TreeSelectionControl.java
index 98c33e8..24f4f1a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TreeSelectionControl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/TreeSelectionControl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkbenchAdaptable.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkbenchAdaptable.java
index 9cf0a3f..3e0dd4e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkbenchAdaptable.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkbenchAdaptable.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkspaceSelectionDialogInput.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkspaceSelectionDialogInput.java
index 7c3c5c5..325ce75 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkspaceSelectionDialogInput.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/preferences/WorkspaceSelectionDialogInput.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommandManager.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommandManager.java
index e925f01..6b3dc1a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommandManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommandManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommands.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommands.java
index 328a216..1541c64 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommands.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/SpawnpointCommands.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/TclSpawnpointMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/TclSpawnpointMessages.java
index d7c555e..a59d894 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/TclSpawnpointMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.activestatedebugger/src/org/eclipse/dltk/tcl/activestatedebugger/spawnpoint/TclSpawnpointMessages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/about.html b/tcl/plugins/org.eclipse.dltk.tcl.core/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.core/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.core/build.properties
index 9d8c26f..599f0de 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.core/packages/org/eclipse/dltk/tcl/core/RebuildProjectsJob.java b/tcl/plugins/org.eclipse.dltk.tcl.core/packages/org/eclipse/dltk/tcl/core/RebuildProjectsJob.java
index 8ececbc..a8aefe3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/packages/org/eclipse/dltk/tcl/core/RebuildProjectsJob.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/packages/org/eclipse/dltk/tcl/core/RebuildProjectsJob.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.core/plugin.properties
index 904f1a0..477925c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclConstants.java
index 7c130c0..c5dd08c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclConstants.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclModuleDeclaration.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclModuleDeclaration.java
index d8a387e..b88c3e1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclModuleDeclaration.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclModuleDeclaration.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclNamespaceDeclaration.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclNamespaceDeclaration.java
index c893f8b..675f1fa 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclNamespaceDeclaration.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclNamespaceDeclaration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.ast;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclStatement.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclStatement.java
index 8df806c..072d706 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclStatement.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/TclStatement.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.ast;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclBlockExpression.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclBlockExpression.java
index cf1ecf7..a86a0f0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclBlockExpression.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclBlockExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclExecuteExpression.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclExecuteExpression.java
index 8c22236..bc610bb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclExecuteExpression.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/ast/expressions/TclExecuteExpression.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.ast.expressions;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCheckContentExclude.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCheckContentExclude.java
index 4711d79..834e506 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCheckContentExclude.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCheckContentExclude.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclConstants.java
index 67b9339..166b1fc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclConstants.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCorePreferences.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCorePreferences.java
index f784370..e793ea9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCorePreferences.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclCorePreferences.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclKeywordsManager.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclKeywordsManager.java
index 68d87d0..ecadef4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclKeywordsManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclKeywordsManager.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclLanguageToolkit.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclLanguageToolkit.java
index 51b9d0a..b675581 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclLanguageToolkit.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclLanguageToolkit.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclNature.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclNature.java
index 310d4ff..53aa069 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclNature.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclNature.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclPlugin.java
index d5cad77..b554fdb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclPlugin.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblemFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblemFactory.java
index 58817fe..c077221 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblemFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblemFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblems.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblems.java
index 24a5677..3d2253a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblems.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/TclProblems.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/Assignment.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/Assignment.java
index 826ef3a..710dec9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/Assignment.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/Assignment.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/BinaryExpression.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/BinaryExpression.java
index f1d542a..a56e942 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/BinaryExpression.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/BinaryExpression.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/IfStatement.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/IfStatement.java
index d4b2816..914ef3e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/IfStatement.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/IfStatement.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/TclAdvancedExecuteExpression.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/TclAdvancedExecuteExpression.java
index e41c8f3..dc40cbc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/TclAdvancedExecuteExpression.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/core/ast/TclAdvancedExecuteExpression.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/indexing/PackageSourceCollector.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/indexing/PackageSourceCollector.java
index 11e3605..26d6655 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/indexing/PackageSourceCollector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/indexing/PackageSourceCollector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCallHierarchyFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCallHierarchyFactory.java
index 2a42352..d14678e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCallHierarchyFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCallHierarchyFactory.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCalleeProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCalleeProcessor.java
index 3ebdbdb..dc8dda0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCalleeProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCalleeProcessor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.core;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCorePreferenceInitializer.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCorePreferenceInitializer.java
index 5663aeb..ce6f488 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCorePreferenceInitializer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclCorePreferenceInitializer.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSearchFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSearchFactory.java
index 7b2f291..6775d9d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSearchFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSearchFactory.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSourceIndexerRequestor.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSourceIndexerRequestor.java
index 80deaad..a90ac28 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSourceIndexerRequestor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/TclSourceIndexerRequestor.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/FieldNameProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/FieldNameProvider.java
index 79cf8c8..8729ab0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/FieldNameProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/FieldNameProvider.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclASTUtil.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclASTUtil.java
index 5670f7a..c564c90 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclASTUtil.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclASTUtil.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclAssistParser.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclAssistParser.java
index a374226..b1365ff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclAssistParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclAssistParser.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.core.codeassist;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclCompletionEngine.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclCompletionEngine.java
index fda0c65..2dead32 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclCompletionEngine.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclCompletionEngine.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionEngine.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionEngine.java
index 16fec37..52c4e60 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionEngine.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionEngine.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.core.codeassist;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionParser.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionParser.java
index 7fcb4d3..c00a6b4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/TclSelectionParser.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordArgumentOrFunctionArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordArgumentOrFunctionArgument.java
index d732285..628d9a8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordArgumentOrFunctionArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordArgumentOrFunctionArgument.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordOrFunction.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordOrFunction.java
index dda67a8..1bc5aff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordOrFunction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnKeywordOrFunction.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnVariable.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnVariable.java
index 7ca1c27..2e682bd 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnVariable.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/CompletionOnVariable.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/TclCompletionParser.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/TclCompletionParser.java
index 429f3ae..316c083 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/TclCompletionParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/completion/TclCompletionParser.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.core.codeassist.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnAST.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnAST.java
index 02c9391..64b6a7a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnAST.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnAST.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnKeywordOrFunction.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnKeywordOrFunction.java
index e8df8a0..fff4da2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnKeywordOrFunction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnKeywordOrFunction.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnNode.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnNode.java
index b060709..e7b44d9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnNode.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnNode.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnVariable.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnVariable.java
index c28d4b3..ee33273 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnVariable.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/codeassist/selection/SelectionOnVariable.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/ProcessOutputCollector.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/ProcessOutputCollector.java
index b993a6d..d1e217f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/ProcessOutputCollector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/ProcessOutputCollector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclBuildPathPackageCollector.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclBuildPathPackageCollector.java
index 2a40c27..205b3c4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclBuildPathPackageCollector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclBuildPathPackageCollector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclVariableResolver.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclVariableResolver.java
index 541e1fa..2f806ed 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclVariableResolver.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/packages/TclVariableResolver.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclCallProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclCallProcessor.java
index e22732f..312cd79 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclCallProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclCallProcessor.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclMatchLocator.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclMatchLocator.java
index a2ea5f8..88dbff9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclMatchLocator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclMatchLocator.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclSearchPatternProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclSearchPatternProcessor.java
index 520a5c2..8a79773 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclSearchPatternProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/core/search/TclSearchPatternProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Yuri Strot)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/OldTclParserUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/OldTclParserUtils.java
index 3d56489..4576d7d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/OldTclParserUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/OldTclParserUtils.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/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclASTBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclASTBuilder.java
index 6349776..4ac1195 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclASTBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclASTBuilder.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.parser;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclSourceElementParser.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclSourceElementParser.java
index 44e8698..76b777a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclSourceElementParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclSourceElementParser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclTodoParserType.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclTodoParserType.java
index da824c3..4494c65 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclTodoParserType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/parser/TclTodoParserType.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclModelBuildContext.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclModelBuildContext.java
index 3d66f93..8dbe003 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclModelBuildContext.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclModelBuildContext.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclSourceElementParser2.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclSourceElementParser2.java
index 5181153..dd79831 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclSourceElementParser2.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclSourceElementParser2.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclTypeResolver.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclTypeResolver.java
index d1d9794..35b0f5a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclTypeResolver.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/TclTypeResolver.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclCatchModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclCatchModelBuilder.java
index 0dea8f7..12aad88 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclCatchModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclCatchModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclGlobalVariableModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclGlobalVariableModelBuilder.java
index 9e95b66..095be90 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclGlobalVariableModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclGlobalVariableModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceModelBuilder.java
index e715a21..87219fb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceVariableModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceVariableModelBuilder.java
index 24c9945..1473cb0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceVariableModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclNamespaceVariableModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclPackageModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclPackageModelBuilder.java
index 7a6f662..0413e62 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclPackageModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclPackageModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclProcModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclProcModelBuilder.java
index aa21464..fa8d7f7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclProcModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclProcModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclSourceModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclSourceModelBuilder.java
index 83598d6..158fc3b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclSourceModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclSourceModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclUpvarModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclUpvarModelBuilder.java
index 86f2893..1b14aa7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclUpvarModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclUpvarModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclVariableModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclVariableModelBuilder.java
index dbedbe0..261561c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclVariableModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/internal/structure/builders/TclVariableModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java
index 4b89804..b1b0ba3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuildContext.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuildContext.java
index a902692..d0aa7e8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuildContext.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuildContext.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilder.java
index c6dac5b..791c0c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilderDetector.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilderDetector.java
index 56514d3..b450ae3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilderDetector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclModelBuilderDetector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeHandler.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeHandler.java
index fd1dfb9..eedf70d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeHandler.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeHandler.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeResolver.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeResolver.java
index c45d223..cff35e0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeResolver.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/ITclTypeResolver.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelBuilderUtil.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelBuilderUtil.java
index 3b31f2b..d394443 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelBuilderUtil.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelBuilderUtil.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelProblem.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelProblem.java
index 40d78c0..d411e51 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelProblem.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclModelProblem.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclProcessorUtil.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclProcessorUtil.java
index 95b3fc2..67e072d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclProcessorUtil.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/TclProcessorUtil.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/about.html b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/build.properties
index 58c6dbd..7bf053e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/plugin.properties
index 0ecf1bd..1b5ee3e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/AbstractPulldownAction.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/AbstractPulldownAction.java
index 8a555c2..84f4a1a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/AbstractPulldownAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/AbstractPulldownAction.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/Messages.java
index 4178184..473b8d4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/OpenConsoleAction.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/OpenConsoleAction.java
index 65d7dc9..60f1c06 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/OpenConsoleAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/OpenConsoleAction.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsole.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsole.java
index a1bedf8..9675ade 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsole.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsole.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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleCompletionProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleCompletionProcessor.java
index a1c41ee..2123e96 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleCompletionProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleCompletionProcessor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.console.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java
index d47eb28..74b97f1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleTextHover.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleTextHover.java
index cc20a78..43145ed 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleTextHover.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleTextHover.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.tcl.internal.console.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclScriptToConsole.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclScriptToConsole.java
index 120abf0..944ffa7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclScriptToConsole.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclScriptToConsole.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.console.ui.actions;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclTextToConsoleAction.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclTextToConsoleAction.java
index 64c8404..5c2449d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclTextToConsoleAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/actions/PasteTclTextToConsoleAction.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.console.ui.actions;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferenceInitializer.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferenceInitializer.java
index 6a4cbf1..9ef6102 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferenceInitializer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferenceInitializer.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.tcl.internal.console.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferencePage.java
index e18664f..bd62b73 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/preferences/TclConsolePreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.console.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/Messages.java
index f7d08a4..18c2bbd 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclAddWatchpointDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclAddWatchpointDialog.java
index 6c34b01..9233b6e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclAddWatchpointDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclAddWatchpointDialog.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2016 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugModelPresentation.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugModelPresentation.java
index bba88b1..9612eb3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugModelPresentation.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugModelPresentation.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.tcl.internal.debug.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUILangaugeToolkit.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUILangaugeToolkit.java
index b898380..6bb8892 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUILangaugeToolkit.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUILangaugeToolkit.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 Jae Gangemi 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:
  *     Jae Gangemi - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPlugin.java
index 61f9cd4..3d816eb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPlugin.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.tcl.internal.debug.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPreferenceInitializer.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPreferenceInitializer.java
index 66ebcb3..38f30e3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPreferenceInitializer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclDebugUIPreferenceInitializer.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 Jae Gangemi 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:
  *     Jae Gangemi - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclEditorDebugAdapterFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclEditorDebugAdapterFactory.java
index fe37e09..58d8edf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclEditorDebugAdapterFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclEditorDebugAdapterFactory.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 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
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclToggleBreakpointAdapter.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclToggleBreakpointAdapter.java
index 98cf0c3..98baeda 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclToggleBreakpointAdapter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclToggleBreakpointAdapter.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclWatchExpressionDelegate.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclWatchExpressionDelegate.java
index faccbe2..76299f3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclWatchExpressionDelegate.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/TclWatchExpressionDelegate.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ActionMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ActionMessages.java
index d861da0..831b104 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ActionMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ActionMessages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/IToggleSpawnpointsTarget.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/IToggleSpawnpointsTarget.java
index 5459178..8e06574 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/IToggleSpawnpointsTarget.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/IToggleSpawnpointsTarget.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/RulerToggleSpawnpointActionDelegate.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/RulerToggleSpawnpointActionDelegate.java
index 749e5fb..11927cb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/RulerToggleSpawnpointActionDelegate.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/RulerToggleSpawnpointActionDelegate.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ToggleSpawnpointAction.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ToggleSpawnpointAction.java
index 8bf1ca0..e78ff74 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ToggleSpawnpointAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/actions/ToggleSpawnpointAction.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/ConsoleMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/ConsoleMessages.java
index 749a064..1021f03 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/ConsoleMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/ConsoleMessages.properties b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/ConsoleMessages.properties
index 29d9df6..1cd6870 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/ConsoleMessages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclConsoleTracker.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclConsoleTracker.java
index 4d04eb8..7aa7ad0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclConsoleTracker.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclConsoleTracker.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.console;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclFileHyperlink.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclFileHyperlink.java
index 8572ffc..a9f935c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclFileHyperlink.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/console/TclFileHyperlink.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.console;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleClassVariablesHandler.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleClassVariablesHandler.java
index d55ed1e..8d106fc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleClassVariablesHandler.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleClassVariablesHandler.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 Jae Gangemi 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:
  *     Jae Gangemi - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleGlobalVariablesHandler.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleGlobalVariablesHandler.java
index 2549898..8720818 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleGlobalVariablesHandler.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleGlobalVariablesHandler.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 Jae Gangemi 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:
  *     Jae Gangemi - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleLocalVariablesHandler.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleLocalVariablesHandler.java
index ef3ebce..e205122 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleLocalVariablesHandler.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/handlers/ToggleLocalVariablesHandler.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 Jae Gangemi 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:
  *     Jae Gangemi - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AddTclInterpreterDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AddTclInterpreterDialog.java
index 0f5d8b4..98585ff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AddTclInterpreterDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AddTclInterpreterDialog.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AvailablePackagesBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AvailablePackagesBlock.java
index ea2a05e..643818b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AvailablePackagesBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/AvailablePackagesBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2017 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
  *
  * Contributors:
  *     xored software,Inc.  - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/CombinedSet.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/CombinedSet.java
index 13a686d..6eb9edb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/CombinedSet.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/CombinedSet.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java
index d8f8204..a4f6748 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterContainerWizardPage.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterContainerWizardPage.java
index 14d8678..d9c5213 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterContainerWizardPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterContainerWizardPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterEnvironmentVariablesBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterEnvironmentVariablesBlock.java
index 769a451..c416ade 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterEnvironmentVariablesBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterEnvironmentVariablesBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterLibraryBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterLibraryBlock.java
index 5177a0d..07b925a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterLibraryBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterLibraryBlock.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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterMessages.java
index 36bb910..2e82cab 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterMessages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterPreferencePage.java
index 95f0a9a..baf8fad 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterPreferencePage.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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterTab.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterTab.java
index 41e7bc8..7fc2285 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterTab.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterTab.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/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpretersBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpretersBlock.java
index 6503590..2554e99 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpretersBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpretersBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.interpreters;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclPackagesContainerPage.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclPackagesContainerPage.java
index 1034cb6..9566037 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclPackagesContainerPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclPackagesContainerPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016, 2018 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclMainLaunchConfigurationTab.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclMainLaunchConfigurationTab.java
index 5b5fccd..b54a61d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclMainLaunchConfigurationTab.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclMainLaunchConfigurationTab.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.tcl.internal.debug.ui.launchConfigurations;
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteLaunchConfigurationTab.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteLaunchConfigurationTab.java
index ca2339e..66ee7e8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteLaunchConfigurationTab.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteLaunchConfigurationTab.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTab.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTab.java
index a2165ad..05483d8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTab.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTab.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.launchConfigurations;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTabGroup.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTabGroup.java
index 1467d69..00ff67b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTabGroup.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclRemoteTabGroup.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.launchConfigurations;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclScriptArgumentsTab.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclScriptArgumentsTab.java
index 88d5705..ec4458b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclScriptArgumentsTab.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclScriptArgumentsTab.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.tcl.internal.debug.ui.launchConfigurations;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclTabGroup.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclTabGroup.java
index f23001e..2689c33 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclTabGroup.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launchConfigurations/TclTabGroup.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug.ui.launchConfigurations;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launcher/TclLaunchShortcut.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launcher/TclLaunchShortcut.java
index 2e4eaae..9a62ece 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launcher/TclLaunchShortcut.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/launcher/TclLaunchShortcut.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.tcl.internal.debug.ui.launcher;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebugPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebugPreferencePage.java
index 16185a3..9b4317e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebugPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebugPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebuggingEnginePreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebuggingEnginePreferencePage.java
index 538031e..4355ede 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebuggingEnginePreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/preferences/TclDebuggingEnginePreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2016 Jae Gangemi 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:
  *     Jae Gangemi - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug/about.html b/tcl/plugins/org.eclipse.dltk.tcl.debug/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.debug/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.debug/build.properties
index 4c3b290..0c68518 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug/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/tcl/plugins/org.eclipse.dltk.tcl.debug/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.debug/plugin.properties
index 17f6b34..159b46c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.debug/src/org/eclipse/dltk/tcl/internal/debug/TclDebugPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.debug/src/org/eclipse/dltk/tcl/internal/debug/TclDebugPlugin.java
index 3a35bdb..2a9a3b2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug/src/org/eclipse/dltk/tcl/internal/debug/TclDebugPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug/src/org/eclipse/dltk/tcl/internal/debug/TclDebugPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.debug;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/.settings/org.eclipse.jdt.ui.prefs b/tcl/plugins/org.eclipse.dltk.tcl.formatter/.settings/org.eclipse.jdt.ui.prefs
index 79706d3..fb280ec 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/.settings/org.eclipse.jdt.ui.prefs
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2008 xored software, Inc.  \r\n *\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html  \r\n *\r\n * Contributors\:\r\n *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * This program and the accompanying materials are made available under the\r\n * terms of the Eclipse Public License v. 2.0 which is available at\r\n * http://www.eclipse.org/legal/epl-2.0.\r\n * \r\n * SPDX-License-Identifier: EPL-2.0  \r\n *\r\n * Contributors\:\r\n *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
 sp_cleanup.add_missing_annotations=true
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/about.html b/tcl/plugins/org.eclipse.dltk.tcl.formatter/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.formatter/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.formatter/plugin.properties
index be4293f..9f7cca3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/plugin.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatter.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatter.java
index 3c6f436..5e554d2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterConstants.java
index ce4b019..174af1f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterConstants.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterFactory.java
index 8c32e65..110125d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/TclFormatterFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/DumpContentException.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/DumpContentException.java
index 759a3dd..08bacd0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/DumpContentException.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/DumpContentException.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/FormatterIndentDetector.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/FormatterIndentDetector.java
index 2703902..e5c12b8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/FormatterIndentDetector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/FormatterIndentDetector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/Messages.java
index 94c8e33..a6c93fb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPlugin.java
index 76c209d..121b056 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPlugin.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPreferenceInitializer.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPreferenceInitializer.java
index 25170ea..73faa66 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPreferenceInitializer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterPreferenceInitializer.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterWriter.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterWriter.java
index 73cd84e..8b77c44 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterWriter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/internal/TclFormatterWriter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterBlankLinesPage.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterBlankLinesPage.java
index 4f1d254..343f192 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterBlankLinesPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterBlankLinesPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterCommentsPage.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterCommentsPage.java
index 78e59c8..6c73bf7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterCommentsPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterCommentsPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterIndentationTabPage.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterIndentationTabPage.java
index 79ed725..33c5451 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterIndentationTabPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterIndentationTabPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterModifyDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterModifyDialog.java
index 0bfc0c5..3791b98 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterModifyDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.formatter/src/org/eclipse/dltk/tcl/formatter/preferences/TclFormatterModifyDialog.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/about.html b/tcl/plugins/org.eclipse.dltk.tcl.launching/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
index 43621b6..754d963 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.launching/console/ConsoleProxy.tcl b/tcl/plugins/org.eclipse.dltk.tcl.launching/console/ConsoleProxy.tcl
index a053bd9..0e6e6f6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/console/ConsoleProxy.tcl
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/console/ConsoleProxy.tcl
@@ -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/tcl/plugins/org.eclipse.dltk.tcl.launching/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.launching/plugin.properties
index a7c1913..d75b6b6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleConstants.java
index 9027e37..cfa7976 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleConstants.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/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleUtil.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleUtil.java
index 5cc28f2..623fdd9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleUtil.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclConsoleUtil.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.console;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclInterpreter.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclInterpreter.java
index d718b5d..866e35a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclInterpreter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/console/TclInterpreter.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.console;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstall.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstall.java
index f47d187..8ce2bcc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstall.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstall.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.launching;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstallType.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstallType.java
index 314535e..9663c63 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstallType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/GenericTclInstallType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.launching;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/TclInterpreterRunner.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/TclInterpreterRunner.java
index deff4cf..ff67231 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/TclInterpreterRunner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/internal/launching/TclInterpreterRunner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.launching;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationConstants.java
index 9b44799..179a4bd 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationConstants.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/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationDelegate.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationDelegate.java
index 025adbd..a067f7a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationDelegate.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchConfigurationDelegate.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/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchingPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchingPlugin.java
index 17dc16d..f0710a9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchingPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.launching/src/org/eclipse/dltk/tcl/launching/TclLaunchingPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.launching;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/about.html b/tcl/plugins/org.eclipse.dltk.tcl.parser/about.html
index d4cc693..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/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/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java
index 3334e9d..746fe38 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstFactory.java
index 0c050ea..663be04 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstPackage.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstPackage.java
index 96d2299..d3e5297 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstPackage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/AstPackage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java
index 124132d..fb1bf84 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ISubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ISubstitution.java
index 3e4edd8..200c2de 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ISubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ISubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java
index ac50a9f..c1a6ef0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java
index f90ee35..5cf779d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java
index 6a63fbd..084ddb7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java
index f57c69c..ab82795 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgument.java
index a1a9af7..fbad639 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgument.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentKind.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentKind.java
index 7277ce5..4750ca8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentKind.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentKind.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java
index 6260d95..77eccbe 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java
index 1305344..c0235e8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java
index 70fbfa9..8df4fac 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java
index 4156f8e..f5febe5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java
index 5f3ed73..f9fd798 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java
index d43fbd0..2ab4c35 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java
index a52e9c1..e3864a4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java
index b88ef5e..41b2fd7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java
index a3a4e60..81c0890 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java
index 6108648..7f17808 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java
index 6e12fbe..c82e857 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java
index d8f2fa6..bed3ff6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java
index 3484250..4cf1ed1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java
index 377d9ec..ca4ad78 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java
index 1c5c81d..8eafbdc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstAdapterFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstAdapterFactory.java
index db2b811..8694b25 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstAdapterFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstAdapterFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java
index 52477fe..0e317a5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.parser/build.properties
index 331a573..55127df 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/build.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# 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
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java
index de15c71..2ca3073 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java
index 8d8738b..045c8ac 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java
index 31c0c0f..af826da 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java
index a2b2d12..5112521 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java
index e723fb6..906e452 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsFactory.java
index 0b1f35d..88847b3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsPackage.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsPackage.java
index bf05d02..2755cdf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsPackage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/DefinitionsPackage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java
index b449add..16cc832 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java
index e65d03c..675e618 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java
index bd4a321..de7123d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java
index 4d9a723..4344359 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java
index f855865..97c7f3d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java
index a1312a4..25a4a6d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java
index d7e5362..b48f780 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java
index efc3594..9fa1d5c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java
index 7510ff6..afe5e0d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java
index f0b231c..8cd4218 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java
index 86de36c..f065ca2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java
index 6d9516c..4aee85a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java
index cec3e02..3f5aeeb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java
index fea2b00..70d6d3f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java
index 38e9405..fd4f59f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsAdapterFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsAdapterFactory.java
index cc63e47..0153574 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsAdapterFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsAdapterFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceFactoryImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceFactoryImpl.java
index ed6f43d..282744d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceFactoryImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceFactoryImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceImpl.java
index 9580e57..73da4a7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsResourceImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java
index ec4e27e..a7a89e6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsXMLProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsXMLProcessor.java
index b3ebca9..68c2cc3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsXMLProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsXMLProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.properties
index 0b4b92d..7fb2326 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/TclParserCore.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/TclParserCore.java
index 41505ed..8aca753 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/TclParserCore.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/TclParserCore.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/BracesSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/BracesSubstitution.java
index 885793f..6b937c7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/BracesSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/BracesSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CodeScanner.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CodeScanner.java
index 6f5cb04..d73e9d7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CodeScanner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CodeScanner.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CommandSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CommandSubstitution.java
index ffc8cef..6f5c565 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CommandSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/CommandSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ErrorDescription.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ErrorDescription.java
index ad0ff2a..ccebcc2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ErrorDescription.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ErrorDescription.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ICodeScanner.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ICodeScanner.java
index d40bc0c..09090f7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ICodeScanner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ICodeScanner.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ISubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ISubstitution.java
index 7ec230c..5c2700c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ISubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/ISubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/IWordSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/IWordSubstitution.java
index 67a591c..baba20c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/IWordSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/IWordSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/MagicBackslashSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/MagicBackslashSubstitution.java
index 9812b5d..4a7bd1c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/MagicBackslashSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/MagicBackslashSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/Messages.java
index 18b26ef..0930065 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/NormalBackslashSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/NormalBackslashSubstitution.java
index bb6a045..af00694 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/NormalBackslashSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/NormalBackslashSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/QuotesSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/QuotesSubstitution.java
index 3a824dc..281ad9b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/QuotesSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/QuotesSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/SimpleTclParser.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/SimpleTclParser.java
index 289e631..36456ff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/SimpleTclParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/SimpleTclParser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclCommand.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclCommand.java
index bff1279..778bfee 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclCommand.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclCommand.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclElement.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclElement.java
index f35638b..3acd1e1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclElement.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclElement.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclParseException.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclParseException.java
index 8521785..5ba507a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclParseException.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclParseException.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclScript.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclScript.java
index 4c6fa23..09f31ff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclScript.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclScript.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclTextUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclTextUtils.java
index ce67a4c..cbd9e87 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclTextUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclTextUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWord.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWord.java
index 0f49b5d..bf9d08e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWord.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWord.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWordBuffer.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWordBuffer.java
index c4ec86e..7e353cf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWordBuffer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/TclWordBuffer.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/VariableSubstitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/VariableSubstitution.java
index 42f151b..8e9c03b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/VariableSubstitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/internal/parser/raw/VariableSubstitution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ISubstitutionManager.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ISubstitutionManager.java
index 2e5b23e..fb43cc0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ISubstitutionManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ISubstitutionManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorConstants.java
index 285e8c4..82db413 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorConstants.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorReporter.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorReporter.java
index aff5b70..761b66c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorReporter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclErrorReporter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclParserOptions.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclParserOptions.java
index ccef522..58e8c36 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclParserOptions.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/ITclParserOptions.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/Messages.java
index 5465c08..4fe4dab 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/PerformanceMonitor.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/PerformanceMonitor.java
index 17ee8db..c5ae0d8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/PerformanceMonitor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/PerformanceMonitor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclArgumentMatcher.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclArgumentMatcher.java
index cf53701..7d5264a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclArgumentMatcher.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclArgumentMatcher.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclError.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclError.java
index 2d9b366..d8233fa 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclError.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclError.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclErrorCollector.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclErrorCollector.java
index 692ec9c..3e5ae6d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclErrorCollector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclErrorCollector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParser.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParser.java
index b139cb4..d6ba593 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParserUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParserUtils.java
index 6e9581f..e7e3366 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParserUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclParserUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclVisitor.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclVisitor.java
index 4b239ad..e39ae7a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclVisitor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/TclVisitor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/BuiltinCommandUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/BuiltinCommandUtils.java
index 71df7fb..33e02b0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/BuiltinCommandUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/BuiltinCommandUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionExtensionManager.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionExtensionManager.java
index d02b0d8..0132ab8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionExtensionManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionExtensionManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionLoader.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionLoader.java
index a346c69..fc03097 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionLoader.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionLoader.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionUtils.java
index ffe48db..4d1d274 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/DefinitionUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/IScopeProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/IScopeProcessor.java
index de8ac43..4b2e054 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/IScopeProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/IScopeProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/Info.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/Info.java
index 2bd4a67..e1eefc3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/Info.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/Info.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/NamespaceScopeProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/NamespaceScopeProcessor.java
index 6f2901d..d6f35d5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/NamespaceScopeProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/NamespaceScopeProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/info.properties b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/info.properties
index 28e6159..7258988 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/info.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/definitions/info.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# 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
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/messages.properties b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/messages.properties
index 475bfa6..487c4ca 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/messages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/src/org/eclipse/dltk/tcl/parser/messages.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/about.html b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
index 342192d..e8be15d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/plugin.properties
index 409a086..2738a76 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/resources/TclCheckerConfigurationPage.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/resources/TclCheckerConfigurationPage.java
index ada5f3e..62a4b48 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/resources/TclCheckerConfigurationPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/resources/TclCheckerConfigurationPage.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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/internal/databinging/RadioButtonListValue.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/internal/databinging/RadioButtonListValue.java
index bbb3ff9..c2346b9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/internal/databinging/RadioButtonListValue.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/internal/databinging/RadioButtonListValue.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/AbstractOutputProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/AbstractOutputProcessor.java
index 3895279..93f1766 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/AbstractOutputProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/AbstractOutputProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Checker4OutputProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Checker4OutputProcessor.java
index 714d3fd..f073336 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Checker4OutputProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Checker4OutputProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Coord.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Coord.java
index 11099af..1f36125 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Coord.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Coord.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/CoordRange.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/CoordRange.java
index 3baaea4..9f9818c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/CoordRange.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/CoordRange.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IContributedResource.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IContributedResource.java
index dbec7c7..1e9bee85 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IContributedResource.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IContributedResource.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ILineTrackerFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ILineTrackerFactory.java
index 63100bf..657d0de 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ILineTrackerFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ILineTrackerFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IOutputProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IOutputProcessor.java
index 9266244..a0b924f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IOutputProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/IOutputProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ITclCheckerReporter.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ITclCheckerReporter.java
index 7f775e8..754cf56 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ITclCheckerReporter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ITclCheckerReporter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Messages.java
index b62c277..21ce045 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclChecker.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclChecker.java
index 3cd008c..af9beda 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclChecker.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclChecker.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.tclchecker;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConfigUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConfigUtils.java
index 3ae1ddb..d88f6fe 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConfigUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConfigUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConstants.java
index 000a674..9669988 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerConstants.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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerErrorReader.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerErrorReader.java
index fc5c7ac..c35b56a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerErrorReader.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerErrorReader.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerHelper.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerHelper.java
index e0fb0ea..c2b8170 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerHelper.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerHelper.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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerImpl.java
index 366ed39..31572d3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerImpl.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.tclchecker;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMarker.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMarker.java
index ce731b9..fa045a2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMarker.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMarker.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMigration.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMigration.java
index d2066f0..5f72f8a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMigration.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerMigration.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOptional.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOptional.java
index b1c105e..53f451b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOptional.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOptional.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOutputReader.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOutputReader.java
index a1b6411..dcb939c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOutputReader.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerOutputReader.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblem.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblem.java
index a40848c..17fe4e9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblem.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblem.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.tclchecker;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblemDescription.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblemDescription.java
index a9185aa..e38cd0c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblemDescription.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerProblemDescription.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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerType.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerType.java
index d3426f1..f6c5e84 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/TclCheckerType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.tclchecker;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/AbstractTclCheckerPreferences.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/AbstractTclCheckerPreferences.java
index d271cb7..1c2ab28 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/AbstractTclCheckerPreferences.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/AbstractTclCheckerPreferences.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/IEnvironmentPredicate.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/IEnvironmentPredicate.java
index 391d08a..a86486a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/IEnvironmentPredicate.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/IEnvironmentPredicate.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ISingleEnvironmentPredicate.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ISingleEnvironmentPredicate.java
index 04f0280..9a9488c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ISingleEnvironmentPredicate.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ISingleEnvironmentPredicate.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ProjectTclCheckerPreferences.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ProjectTclCheckerPreferences.java
index 15aecc3..beff398 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ProjectTclCheckerPreferences.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/ProjectTclCheckerPreferences.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SingleEnvironmentPredicate.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SingleEnvironmentPredicate.java
index 03bf4ba..eef2749 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SingleEnvironmentPredicate.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SingleEnvironmentPredicate.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SystemTclCheckerPreferences.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SystemTclCheckerPreferences.java
index 5e25101..1c21fd3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SystemTclCheckerPreferences.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/impl/SystemTclCheckerPreferences.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/IMarkerFinder.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/IMarkerFinder.java
index ecd9343..a257fe2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/IMarkerFinder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/IMarkerFinder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/ITclCheckerQFixReporter.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/ITclCheckerQFixReporter.java
index 2cf470b..078375e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/ITclCheckerQFixReporter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/ITclCheckerQFixReporter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/Messages.java
index 40c1674..e637f08 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerAnnotationResolution.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerAnnotationResolution.java
index ec15fb5..eea58b9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerAnnotationResolution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerAnnotationResolution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerCorrectionProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerCorrectionProcessor.java
index fba39de..e525c41 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerCorrectionProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerCorrectionProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerFixUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerFixUtils.java
index 51a952c..3974be7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerFixUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerFixUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolution.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolution.java
index 41259da..ee1d39f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolution.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolutionGenerator.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolutionGenerator.java
index 12d4227..2b89446 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolutionGenerator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/qfix/TclCheckerMarkerResolutionGenerator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/AbstractValidatorEditBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/AbstractValidatorEditBlock.java
index 3c24917..1d7ee16 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/AbstractValidatorEditBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/AbstractValidatorEditBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidationHandler.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidationHandler.java
index e7bb238..8537112 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidationHandler.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidationHandler.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorDialogContext.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorDialogContext.java
index a16409d..d7e6f67 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorDialogContext.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorDialogContext.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorEditBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorEditBlock.java
index b6ad429..64fbbee 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorEditBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/IValidatorEditBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/Messages.java
index f66e4da..436136a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/Messages.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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/PathDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/PathDialog.java
index 0e1e406..176445d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/PathDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/PathDialog.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.tclchecker.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/StrUtils.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/StrUtils.java
index 802a4a0..b05f4f0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/StrUtils.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/StrUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceBlock.java
index d5b46d2..eaf0c32 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceDialog.java
index 44edff1..052dc54 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceDialog.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceWizard.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceWizard.java
index 2d8ca3a..b3fb251 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceWizard.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerInstanceWizard.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerProblemPropertyPage.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerProblemPropertyPage.java
index 160e5d8..85b0f89 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerProblemPropertyPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/TclCheckerProblemPropertyPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorConfigComparator.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorConfigComparator.java
index 3103659..a74f312 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorConfigComparator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorConfigComparator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorDialogContext.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorDialogContext.java
index 5e2098b..3161a3d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorDialogContext.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorDialogContext.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorSelectTypePage.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorSelectTypePage.java
index 4703129..4444b29 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorSelectTypePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorSelectTypePage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorWizardPage.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorWizardPage.java
index cb2fef9..9a9f707 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorWizardPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/ValidatorWizardPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/messages.properties b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/messages.properties
index 53a4df7..3115dc7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/messages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/ui/preferences/messages.properties
@@ -3,10 +3,12 @@
 PathDialog_PathLabel=Path
 ###############################################################################
 # 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/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/Checker5OutputProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/Checker5OutputProcessor.java
index 375a77e..74037b2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/Checker5OutputProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/Checker5OutputProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/IToken.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/IToken.java
index 11ddf23..7244088 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/IToken.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/IToken.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/ListToken.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/ListToken.java
index ad62088..250b0e9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/ListToken.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/ListToken.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/RawToken.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/RawToken.java
index 55180e9..da22de7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/RawToken.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/RawToken.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/TclDictionaryParser.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/TclDictionaryParser.java
index 629aa15..cca8189 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/TclDictionaryParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/TclDictionaryParser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/WordToken.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/WordToken.java
index a9d158b..280d181 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/WordToken.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/internal/tclchecker/v5/WordToken.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/ITclCheckerPreferences.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/ITclCheckerPreferences.java
index be7cf68..7eafe5a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/ITclCheckerPreferences.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/ITclCheckerPreferences.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/TclCheckerPlugin.java b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/TclCheckerPlugin.java
index 277564c..fd1fe36 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/TclCheckerPlugin.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/src/org/eclipse/dltk/tcl/tclchecker/TclCheckerPlugin.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.tclchecker;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/tclchecker.properties b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/tclchecker.properties
index 37ee9b2..cffff80 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/tclchecker.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tclchecker/tclchecker.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/tcl/plugins/org.eclipse.dltk.tcl.tcllib/about.html b/tcl/plugins/org.eclipse.dltk.tcl.tcllib/about.html
index d4cc693..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tcllib/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tcllib/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/tcl/plugins/org.eclipse.dltk.tcl.tcllib/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.tcllib/plugin.properties
index 7784f6b..32a4aaa 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.tcllib/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.tcllib/plugin.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/about.html b/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/plugin.properties
index a509132..0becfa0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.testing.tcltest/plugin.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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.testing/about.html b/tcl/plugins/org.eclipse.dltk.tcl.testing/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.testing/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.testing/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.testing/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.testing/plugin.properties
index 33a9ee2..11a7236 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.testing/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.testing/plugin.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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.testing/src/org/eclipse/dltk/tcl/internal/testing/TclTestingPropertyTester.java b/tcl/plugins/org.eclipse.dltk.tcl.testing/src/org/eclipse/dltk/tcl/internal/testing/TclTestingPropertyTester.java
index dba995f..42a0cfb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.testing/src/org/eclipse/dltk/tcl/internal/testing/TclTestingPropertyTester.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.testing/src/org/eclipse/dltk/tcl/internal/testing/TclTestingPropertyTester.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/about.html b/tcl/plugins/org.eclipse.dltk.tcl.ui/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl.ui/build.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/build.properties
index d7aa303..d4a80c7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/build.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.ui/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/plugin.properties
index c7cc4ba..431f359 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableBlock.java
index 798f186..809de75 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableBlock.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableContentProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableContentProvider.java
index 8622cef..da92dbc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableContentProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableContentProvider.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableEntry.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableEntry.java
index 0aa8850..fee63ce 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableEntry.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableEntry.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableLabelProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableLabelProvider.java
index 832f183..862e5b1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableLabelProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/GlobalVariableLabelProvider.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclCodeTemplateArea.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclCodeTemplateArea.java
index cb2d287..52be949 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclCodeTemplateArea.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclCodeTemplateArea.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclImages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclImages.java
index 22d491c..d271752 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclImages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclImages.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclInterpreterMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclInterpreterMessages.java
index f0991cd..f989071 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclInterpreterMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclInterpreterMessages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclScriptFileConfigurator.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclScriptFileConfigurator.java
index 7e8832b..99cef4c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclScriptFileConfigurator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclScriptFileConfigurator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUI.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUI.java
index 5623788..0729fdf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUI.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUI.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUILanguageToolkit.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUILanguageToolkit.java
index 9f6d0bc..bc7efcf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUILanguageToolkit.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUILanguageToolkit.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUIPreferenceInitializer.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUIPreferenceInitializer.java
index 23667cc..748349f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUIPreferenceInitializer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/TclUIPreferenceInitializer.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenMethodAction.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenMethodAction.java
index 1062ab9..cf3c7c3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenMethodAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenMethodAction.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeAction.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeAction.java
index bb1dc47..4d1c452 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeAction.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.actions;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeInHierarchyAction.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeInHierarchyAction.java
index 23abfdb..bace64c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeInHierarchyAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/actions/TclOpenTypeInHierarchyAction.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.actions;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclBrowsingPerspectiveFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclBrowsingPerspectiveFactory.java
index a3303f9..8b2d5d5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclBrowsingPerspectiveFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclBrowsingPerspectiveFactory.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclDecoratingModelLabelProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclDecoratingModelLabelProvider.java
index 6afd730..e9509e9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclDecoratingModelLabelProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclDecoratingModelLabelProvider.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectAndSourceFolderContentProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectAndSourceFolderContentProvider.java
index f8052e9..8e48952 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectAndSourceFolderContentProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectAndSourceFolderContentProvider.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectsView.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectsView.java
index 7bf05f9..ea3336e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectsView.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/browsing/TclProjectsView.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/Messages.java
index dbc1fd7..e8861c6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewer.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewer.java
index 6e22050..279ddd0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewer.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewerCreator.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewerCreator.java
index 8f6ddbd..a86fffe 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewerCreator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/TclMergeViewerCreator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/messages.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/messages.properties
index 738f41d..6aba521 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/messages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/compare/messages.properties
@@ -1,10 +1,12 @@
 #******************************************************************************
 # Copyright (c) 2008 xored software, Inc.
 #
-# All rights reserved. This program and 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:
 #     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsBlock.java
index bc25b87..5d91d46 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2018 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsDialog.java
index a4e23d8..ce31930 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesLocationsDialog.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesMessages.java
index 39bc02c..fbf4cd6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/ManPagesMessages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclCommentDocumentationProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclCommentDocumentationProvider.java
index ad82875..eee9ddf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclCommentDocumentationProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclCommentDocumentationProvider.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.documentation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclManPagesDocumentationProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclManPagesDocumentationProvider.java
index 38fc574..563abb2 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclManPagesDocumentationProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/documentation/TclManPagesDocumentationProvider.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/ActionMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/ActionMessages.java
index a5b4d3c..7132d11 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/ActionMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/ActionMessages.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/ActionMessages.properties
index 81b6b54..7e31a00 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/ActionMessages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclBracketInserter.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclBracketInserter.java
index 482f4fe..1d4f344 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclBracketInserter.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclBracketInserter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclDocumentSetupParticipant.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclDocumentSetupParticipant.java
index a8c8890..78423ac 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclDocumentSetupParticipant.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclDocumentSetupParticipant.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.editor;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclEditor.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclEditor.java
index 2e3925f..f6ab382 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclEditor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclEditor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.editor;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlineLabelDecorator.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlineLabelDecorator.java
index c692e06..ce7d08f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlineLabelDecorator.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlineLabelDecorator.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.editor;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlinePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlinePage.java
index c852956..c2b26aa 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlinePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/editor/TclOutlinePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.editor;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/hierarchy/TclHierarchyInformationControl.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/hierarchy/TclHierarchyInformationControl.java
index 28c5d75..3a7c228 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/hierarchy/TclHierarchyInformationControl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/hierarchy/TclHierarchyInformationControl.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.hierarchy;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/infoviews/TclDocumentationView.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/infoviews/TclDocumentationView.java
index b03fdf0..1f1c4fb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/infoviews/TclDocumentationView.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/infoviews/TclDocumentationView.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.infoviews;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementListAdapterFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementListAdapterFactory.java
index c5d7ab2..58c9b40 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementListAdapterFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementListAdapterFactory.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.navigation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementsView.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementsView.java
index f654c74..292a4ad 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementsView.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/ElementsView.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.navigation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/FunctionsView.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/FunctionsView.java
index 37ea479..c95b4c7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/FunctionsView.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/FunctionsView.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.navigation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/NamespacesView.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/NamespacesView.java
index f4b37fc..6153bcf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/NamespacesView.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/NamespacesView.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.navigation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackageFilterAction.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackageFilterAction.java
index c43b7c7..409e112 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackageFilterAction.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackageFilterAction.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.navigation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackagesView.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackagesView.java
index d632cb2..34e3b32 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackagesView.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/navigation/PackagesView.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.navigation;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ManPagesPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ManPagesPreferencePage.java
index 3c6967a..b94e652 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ManPagesPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ManPagesPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ProjectBuildJob.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ProjectBuildJob.java
index 8994e80..bdc88c7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ProjectBuildJob.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/ProjectBuildJob.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclBuildPathPropertyPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclBuildPathPropertyPage.java
index 677c44f..ccb71a5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclBuildPathPropertyPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclBuildPathPropertyPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCheckContentExcludeInputDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCheckContentExcludeInputDialog.java
index cfe2c3b..8cee259 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCheckContentExcludeInputDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCheckContentExcludeInputDialog.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCodeTemplatesPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCodeTemplatesPreferencePage.java
index 88c56e4..effcd8e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCodeTemplatesPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCodeTemplatesPreferencePage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCorePreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCorePreferencePage.java
index 624c92d..d479df0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCorePreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclCorePreferencePage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorAssistancePreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorAssistancePreferencePage.java
index ec96427..d32d832 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorAssistancePreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorAssistancePreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorColoringConfigurationBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorColoringConfigurationBlock.java
index f273d03..9f008c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorColoringConfigurationBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorColoringConfigurationBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorPreferencesPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorPreferencesPage.java
index 701ecfc..21f43c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorPreferencesPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorPreferencesPage.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorSyntaxColoringPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorSyntaxColoringPreferencePage.java
index e1d993d..c572b93 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorSyntaxColoringPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclEditorSyntaxColoringPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFoldingPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFoldingPreferencePage.java
index d7a489f..ad4d10e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFoldingPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFoldingPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFormatterPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFormatterPreferencePage.java
index 52c9248..cd62e5b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFormatterPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclFormatterPreferencePage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalConfigurationBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalConfigurationBlock.java
index b4c537c..534fcbe 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalConfigurationBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalConfigurationBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalPreferencesPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalPreferencesPage.java
index 3a25618..03783f9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalPreferencesPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalPreferencesPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalVariablesPropertyPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalVariablesPropertyPage.java
index f707f1a..3db710d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalVariablesPropertyPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclGlobalVariablesPropertyPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclPreferencesMessages.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclPreferencesMessages.properties
index 5d4ea9d..57afa60 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclPreferencesMessages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclPreferencesMessages.properties
@@ -5,10 +5,12 @@
 TclCheckContentExcludeDialog_pattern=Pattern
 ###############################################################################
 # 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
 #
 ###############################################################################
 #Tcl
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingConfigurationBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingConfigurationBlock.java
index 054d38d..2081fbd 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingConfigurationBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingConfigurationBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingPreferencePage.java
index 7ce9374..ea2d7be 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclSmartTypingPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.preferences;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclTodoTaskPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclTodoTaskPreferencePage.java
index 4e2ff0b..0753b73 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclTodoTaskPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/preferences/TclTodoTaskPreferencePage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclCommentRule.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclCommentRule.java
index 55259ee..4f27b89 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclCommentRule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclCommentRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.rules;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclEscapedCharRule.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclEscapedCharRule.java
index f654ddb..bc1e458 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclEscapedCharRule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclEscapedCharRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.rules;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclFloatNumberRule.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclFloatNumberRule.java
index 160ccfe..63129e5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclFloatNumberRule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclFloatNumberRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.rules;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclParameterRule.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclParameterRule.java
index 51e07b3..f1a513c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclParameterRule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclParameterRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.rules;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclSpacedCommentRule.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclSpacedCommentRule.java
index 9691d4f..3d54ab0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclSpacedCommentRule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclSpacedCommentRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.rules;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclVariableRule.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclVariableRule.java
index d5a46a0..cfcb2cf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclVariableRule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/rules/TclVariableRule.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.rules;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/search/TclSearchPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/search/TclSearchPage.java
index bfd089e..ec2509c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/search/TclSearchPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/search/TclSearchPage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.search;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateAccess.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateAccess.java
index 0c32526..65f1436 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateAccess.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateAccess.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.templates;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateCompletionProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateCompletionProcessor.java
index eb117a1..77f08aa 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateCompletionProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateCompletionProcessor.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.templates;
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateContext.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateContext.java
index ce61e30..c1effc0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateContext.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplateContext.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.templates;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplatesPreferencePage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplatesPreferencePage.java
index 41d49ce..6eba99d 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplatesPreferencePage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclTemplatesPreferencePage.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.templates;
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclUniversalTemplateContextType.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclUniversalTemplateContextType.java
index 0e2f659..1e32cd5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclUniversalTemplateContextType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/templates/TclUniversalTemplateContextType.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/CodeTemplateTclSourceViewerConfiguration.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/CodeTemplateTclSourceViewerConfiguration.java
index 710a39a..5947059 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/CodeTemplateTclSourceViewerConfiguration.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/CodeTemplateTclSourceViewerConfiguration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/Messages.java
index 3b287ba..fbdd2e3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/SimpleTclSourceViewerConfiguration.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/SimpleTclSourceViewerConfiguration.java
index 2e7d082..2ee7387 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/SimpleTclSourceViewerConfiguration.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/SimpleTclSourceViewerConfiguration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclAutoEditStrategy.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclAutoEditStrategy.java
index 9793cf9..26a4572 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclAutoEditStrategy.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclAutoEditStrategy.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeScanner.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeScanner.java
index 5e366aa..edddbda 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeScanner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeTemplateAccess.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeTemplateAccess.java
index 834f0ce..b36d890 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeTemplateAccess.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclCodeTemplateAccess.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclColorConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclColorConstants.java
index db07503..800abbb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclColorConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclColorConstants.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclDocumentScanner.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclDocumentScanner.java
index f01202b..16ed974 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclDocumentScanner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclDocumentScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPairMatcher.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPairMatcher.java
index 0e55b90..59b5022 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPairMatcher.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPairMatcher.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPartitionScanner.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPartitionScanner.java
index 7c89667..7b642f8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPartitionScanner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclPartitionScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclQuickAssistLightBulbUpdater.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclQuickAssistLightBulbUpdater.java
index 820426b..85265be 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclQuickAssistLightBulbUpdater.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclQuickAssistLightBulbUpdater.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourcePackageCorrectionProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourcePackageCorrectionProcessor.java
index dbf7c30..b5f123b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourcePackageCorrectionProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourcePackageCorrectionProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourceViewerConfiguration.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourceViewerConfiguration.java
index dc56264..d86378b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourceViewerConfiguration.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclSourceViewerConfiguration.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclStringScanner.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclStringScanner.java
index 2b8b874..90b8629 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclStringScanner.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclStringScanner.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclTextTools.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclTextTools.java
index d42eb50..af94080 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclTextTools.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclTextTools.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWhitespaceDetector.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWhitespaceDetector.java
index aa3c01f..bfb9b61 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWhitespaceDetector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWhitespaceDetector.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWordDetector.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWordDetector.java
index c4d325f..6465111 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWordDetector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclWordDetector.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/LazyTclTypeCompletionProposal.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/LazyTclTypeCompletionProposal.java
index 9ef8862..fedc2e9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/LazyTclTypeCompletionProposal.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/LazyTclTypeCompletionProposal.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalCollector.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalCollector.java
index 8e56f33..34cd98f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalCollector.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalCollector.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalLabelProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalLabelProvider.java
index faa0bc9..a5666f5 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalLabelProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclCompletionProposalLabelProvider.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclContentAssistPreference.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclContentAssistPreference.java
index 8d90870..c2d74c4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclContentAssistPreference.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclContentAssistPreference.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclKeywordLazyContextInformation.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclKeywordLazyContextInformation.java
index af06f02..b28c00e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclKeywordLazyContextInformation.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclKeywordLazyContextInformation.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclOverrideCompletionProposal.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclOverrideCompletionProposal.java
index 1bdf3cf..e279ea1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclOverrideCompletionProposal.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclOverrideCompletionProposal.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProcessor.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProcessor.java
index 4589e0d..e0c6cee 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProcessor.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProcessor.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.tcl.internal.ui.text.completion;
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProposal.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProposal.java
index 0fe3023..dd3615f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProposal.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclScriptCompletionProposal.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclTypeCompletionProposalComputer.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclTypeCompletionProposalComputer.java
index fd4b5a4..445f3eb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclTypeCompletionProposalComputer.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/completion/TclTypeCompletionProposalComputer.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.completion;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.java
index 725867b..bf116fc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.properties
index 6b1c5ae..25901b1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingMessages.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingPreferenceBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingPreferenceBlock.java
index c9ec4c3..384bedd 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingPreferenceBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingPreferenceBlock.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.folding;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingStructureProvider.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingStructureProvider.java
index d3813d8..dce2efc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingStructureProvider.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/folding/TclFoldingStructureProvider.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.text.folding;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationPage.java
index 49ef3d7..9bbbcc7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationPage.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationWizard.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationWizard.java
index b9779af..2d83fde 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationWizard.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclFileCreationWizard.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclPackageCreationWizard.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclPackageCreationWizard.java
index fd455cf..d6237e0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclPackageCreationWizard.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclPackageCreationWizard.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.wizards;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectCreationWizard.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectCreationWizard.java
index 78eec16..a38c09f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectCreationWizard.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectCreationWizard.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.internal.ui.wizards;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateEntry.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateEntry.java
index 762f596..55885e8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateEntry.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateEntry.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateManager.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateManager.java
index d1d33e9..95874b0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectTemplateManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectWizardFirstPage.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectWizardFirstPage.java
index f8a314d..2ec2410 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectWizardFirstPage.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclProjectWizardFirstPage.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.java
index 5702b64..adcc404 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.properties b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.properties
index 08b0eff..20a1184 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/wizards/TclWizardMessages.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/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPerspective.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPerspective.java
index a089ea7..e6161b0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPerspective.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPerspective.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPreferenceConstants.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPreferenceConstants.java
index 9d21e02..cb7ee46 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPreferenceConstants.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/TclPreferenceConstants.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.ui;
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageFinder.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageFinder.java
index 16383d5..21b856b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageFinder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageFinder.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageLoader.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageLoader.java
index 588fc38..329cc83 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageLoader.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageLoader.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageResource.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageResource.java
index c53674c..0787cca 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageResource.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/ManPageResource.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/dialogs/ManPagesConfigurationDialog.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/dialogs/ManPagesConfigurationDialog.java
index 19c8d52..fe2f08a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/dialogs/ManPagesConfigurationDialog.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/dialogs/ManPagesConfigurationDialog.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/impl/ManPageResourceImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/impl/ManPageResourceImpl.java
index 8d22c68..6507d80 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/impl/ManPageResourceImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/manpages/impl/ManPageResourceImpl.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/text/TclPartitions.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/text/TclPartitions.java
index f4ee2f9..9c8b36f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/text/TclPartitions.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/ui/text/TclPartitions.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/tcl/plugins/org.eclipse.dltk.tcl.validators/about.html b/tcl/plugins/org.eclipse.dltk.tcl.validators/about.html
index d4cc693..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/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/tcl/plugins/org.eclipse.dltk.tcl.validators/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl.validators/plugin.properties
index dd3c3d8..c497c90 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/plugin.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/CheckPreferenceManager.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/CheckPreferenceManager.java
index fc7436b..483149c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/CheckPreferenceManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/CheckPreferenceManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ChecksExtensionManager.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ChecksExtensionManager.java
index af93f32..29fa0c6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ChecksExtensionManager.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ChecksExtensionManager.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ICheckKinds.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ICheckKinds.java
index 514cf93..3a05997 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ICheckKinds.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/ICheckKinds.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclBuildContext.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclBuildContext.java
index 22ec239..f4962c4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclBuildContext.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclBuildContext.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclCheckBuildParticipant.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclCheckBuildParticipant.java
index 0fa0c15..3f9e228 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclCheckBuildParticipant.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/TclCheckBuildParticipant.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/ArgumentsDefinitionCheck.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/ArgumentsDefinitionCheck.java
index 85edd2f..ee0ce67 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/ArgumentsDefinitionCheck.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/ArgumentsDefinitionCheck.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/CommandRedefinitionCheck.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/CommandRedefinitionCheck.java
index 865bb56..5b23738 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/CommandRedefinitionCheck.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/CommandRedefinitionCheck.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedProcCheck.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedProcCheck.java
index d3db740..f2afbb0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedProcCheck.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedProcCheck.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedVariableCheck.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedVariableCheck.java
index 46a1420..b656843 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedVariableCheck.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UndefinedVariableCheck.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UnreachableCodeCheck.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UnreachableCodeCheck.java
index 90765c9..354e3d7 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UnreachableCodeCheck.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/checks/UnreachableCodeCheck.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/Messages.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/Messages.java
index 7f81b96..f8512dc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/Messages.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/Messages.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalyser.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalyser.java
index f9b8823..0e5b456 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalyser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalyser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalysisFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalysisFactory.java
index 7c5241e..496b48c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalysisFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/packages/PackageRequireSourceAnalysisFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParser.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParser.java
index f222e8f..3ec7ce1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParser.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParserFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParserFactory.java
index d3266a0..41da465 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParserFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/internal/validators/task/TclTodoParserFactory.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/ITclCheck.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/ITclCheck.java
index 7ce1690..9c153c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/ITclCheck.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/ITclCheck.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclChecksValidatorType.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclChecksValidatorType.java
index edbd314..5c09b39 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclChecksValidatorType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclChecksValidatorType.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclValidatorsCore.java b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclValidatorsCore.java
index d069039..18fbb51 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclValidatorsCore.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.validators/src/org/eclipse/dltk/tcl/validators/TclValidatorsCore.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl/about.html b/tcl/plugins/org.eclipse.dltk.tcl/about.html
index 7c8477f..164f781 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl/about.html
+++ b/tcl/plugins/org.eclipse.dltk.tcl/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, 2008</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/tcl/plugins/org.eclipse.dltk.tcl/about.properties b/tcl/plugins/org.eclipse.dltk.tcl/about.properties
index a8819d6..b9f4af1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl/about.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tcl/plugins/org.eclipse.dltk.tcl/plugin.properties b/tcl/plugins/org.eclipse.dltk.tcl/plugin.properties
index 3ff815b..6a2dcb6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl/plugin.properties
+++ b/tcl/plugins/org.eclipse.dltk.tcl/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/AllTests.java
index 3e42d51..ce50302 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/AllTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/InstrumentationSetupTests.java b/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/InstrumentationSetupTests.java
index 3618656..6b9893f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/InstrumentationSetupTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.activestatedebugger.tests/src/org/eclipse/dltk/tcl/activestatedebugger/tests/InstrumentationSetupTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/about.html b/tcl/tests/org.eclipse.dltk.tcl.core.tests/about.html
index d4cc693..164f781 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/about.html
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.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/tcl/tests/org.eclipse.dltk.tcl.core.tests/build.properties b/tcl/tests/org.eclipse.dltk.tcl.core.tests/build.properties
index 2fe2bfa..9384897 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/build.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.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/tcl/tests/org.eclipse.dltk.tcl.core.tests/plugin.properties b/tcl/tests/org.eclipse.dltk.tcl.core.tests/plugin.properties
index 5f5bba4..b8cdb40 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/plugin.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.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/tcl/tests/org.eclipse.dltk.tcl.core.tests/scripts/_generator.py b/tcl/tests/org.eclipse.dltk.tcl.core.tests/scripts/_generator.py
index bd29e87..5e95f0c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/scripts/_generator.py
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/scripts/_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/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/AllTests.java
index bb154c8..392ca5c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/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/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/TclContentDescriberTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/TclContentDescriberTests.java
index 7cf3455..f42c34c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/TclContentDescriberTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/TclContentDescriberTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/VariableResolverTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/VariableResolverTests.java
index d77ba17..8b9f3f7 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/VariableResolverTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/VariableResolverTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/Activator.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/Activator.java
index 0e54749..d679413 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/Activator.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/Activator.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/AllTests.java
index 530e57a..092b94c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/CompletionTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/CompletionTests.java
index 0c8b46d..2ccdc63 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/CompletionTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/CompletionTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PACompletionTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PACompletionTests.java
index b391ba3..31a5563 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PACompletionTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PACompletionTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PASelectionTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PASelectionTests.java
index 9b68b37..55afdc3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PASelectionTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/PASelectionTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchTests.java
index 6218258..11750e7 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchVarTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchVarTests.java
index 8eb282d..a2930b3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchVarTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/SearchVarTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/TclSelectionTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/TclSelectionTests.java
index 370f699..7c8996f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/TclSelectionTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/core/tests/model/TclSelectionTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.core.tests.model;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/perfomance/tests/PeromanceTest0.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/perfomance/tests/PeromanceTest0.java
index 1b83ff9..685a63b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/perfomance/tests/PeromanceTest0.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/perfomance/tests/PeromanceTest0.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.parser.perfomance.tests;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/Collector.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/Collector.java
index 8d45738..4602cd9 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/Collector.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/Collector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/ParserInput.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/ParserInput.java
index 78b544e..127b436 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/ParserInput.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/ParserInput.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/SimpleStructureParserTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/SimpleStructureParserTests.java
index b80fa15..6be6a80 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/SimpleStructureParserTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/SimpleStructureParserTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010,2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/StructureParserTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/StructureParserTests.java
index ddc07eb..038ef96 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/StructureParserTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/structure/StructureParserTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AbstractTclParserTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AbstractTclParserTests.java
index 40488e8..eb3ee48 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AbstractTclParserTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AbstractTclParserTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AlgTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AlgTests.java
index 5ceafa9..5eb8a01 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AlgTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AlgTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 207 IBM Corporation 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.tcl.parser.tests;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllParseTests.java
index ab705f5..f1a8d62 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllParseTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.parser.tests;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTests.java
index ca87a6b..ad629a3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.parser.tests;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleParserTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleParserTests.java
index a0c4d88..e125bc4 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleParserTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleParserTests.java
@@ -1,9 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2005, 2017 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * 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.tcl.parser.tests;
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclIfProcessorTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclIfProcessorTests.java
index 1948a55..78d94c5 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclIfProcessorTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclIfProcessorTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParseUtilTests.java b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParseUtilTests.java
index 7f8e8aa..97923fa 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParseUtilTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParseUtilTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/Completion002.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/Completion002.tcl
index 6f45175..371741c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/Completion002.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/Completion002.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/CompletionKeywordNamespace1.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/CompletionKeywordNamespace1.tcl
index 3989366..fe73de8 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/CompletionKeywordNamespace1.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/CompletionKeywordNamespace1.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion003.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion003.tcl
index 10efa53..6839add 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion003.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion003.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion004.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion004.tcl
index 1b34907..60a4f7d 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion004.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Completion/src/completion004.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello.tcl
index 5ee0a80..041ed7f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello2.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello2.tcl
index f4f0070..9a3f58c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello2.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/SearchVar/src/hello2.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection001.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection001.tcl
index ad2d240..bdc15d9 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection001.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection001.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection002.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection002.tcl
index 02d0fff..cb2109d 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection002.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection002.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection003.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection003.tcl
index 189822d..285c138 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection003.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/Selection/src/selection003.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/CompletionKeywordNamespace1.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/CompletionKeywordNamespace1.tcl
index 842149a..fc3520b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/CompletionKeywordNamespace1.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/CompletionKeywordNamespace1.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/X.tcl
index af72b0f..157ca0a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p/X.tcl
index 7a90cbc..b859749 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p1/test.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p1/test.tcl
index 549fd8c..2e0d565 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p1/test.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p1/test.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p2/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p2/X.tcl
index 9b372f0..2da283b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p2/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p2/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p3/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p3/X.tcl
index c405b4c..be99ee0 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p3/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p3/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p4/t.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p4/t.tcl
index 0bb3bb2..79755b3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p4/t.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/p4/t.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/q5/AQ.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/q5/AQ.tcl
index aa60c52..8d2bc84 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/q5/AQ.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch/src/q5/AQ.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch2/src/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch2/src/X.tcl
index fc4b0a9..f2cd77b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch2/src/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.core.tests/workspace/TCLSearch2/src/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/.settings/org.eclipse.jdt.ui.prefs b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/.settings/org.eclipse.jdt.ui.prefs
index b564660..4aa3c08 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,4 @@
 #Wed Oct 01 12:29:50 NOVST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2008 xored software, Inc.  \r\n *\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html  \r\n *\r\n * Contributors\:\r\n *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment"/><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * This program and the accompanying materials are made available under the\r\n * terms of the Eclipse Public License v. 2.0 which is available at\r\n * http://www.eclipse.org/legal/epl-2.0.\r\n * \r\n * SPDX-License-Identifier: EPL-2.0  \r\n *\r\n * Contributors\:\r\n *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment"/><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/AllTests.java
index b9af8fb..630652a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/AllTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/BlankLinesTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/BlankLinesTest.java
index d87d3e6..5375438 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/BlankLinesTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/BlankLinesTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CodeTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CodeTest.java
index 9e8dcbc..591dd76 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CodeTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CodeTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CommentsWrapTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CommentsWrapTest.java
index a6cb080..1cfccf3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CommentsWrapTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/CommentsWrapTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FContext.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FContext.java
index afca156..842a337 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FContext.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FContext.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FullTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FullTest.java
index 1398684..22b0607 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FullTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/FullTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationOffTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationOffTest.java
index 263165d..ead342a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationOffTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationOffTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationTest.java
index 98ebd32..b23a3f3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/IndentationTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/PreserveEmptyLinesTest.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/PreserveEmptyLinesTest.java
index b7b6d22..8a14465 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/PreserveEmptyLinesTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/PreserveEmptyLinesTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SimpleTests.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SimpleTests.java
index 8bdc73b..3919f10 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SimpleTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SimpleTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SwitchTests.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SwitchTests.java
index 5eccfb8..e72fd5e 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SwitchTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/SwitchTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/TestTclFormatter.java b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/TestTclFormatter.java
index 9e20f1a..b772f92 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/TestTclFormatter.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.formatter.tests/src/org/eclipse/dltk/tcl/formatter/tests/TestTclFormatter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Sergey Kanshin)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/plugin.properties b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/plugin.properties
index c6431bc..a38ad7f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/plugin.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/plugin.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/internal/tests/TestTclParser.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/internal/tests/TestTclParser.java
index a8605df..6ba9dae 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/internal/tests/TestTclParser.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/internal/tests/TestTclParser.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AfterCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AfterCommandTests.java
index 8249ab7..6647d03 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AfterCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AfterCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTestsRunner.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTestsRunner.java
index 548a627..670196e 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTestsRunner.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/AllTestsRunner.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/BigFileGenerator.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/BigFileGenerator.java
index 744c0bb..2e0bf25 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/BigFileGenerator.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/BigFileGenerator.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/DefinitionTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/DefinitionTests.java
index aca3488..8eb152f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/DefinitionTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/DefinitionTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/GroupParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/GroupParseTests.java
index 9892ec2..091551a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/GroupParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/GroupParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IfCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IfCommandTests.java
index 019452c..329a700 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IfCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IfCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IndexTypeParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IndexTypeParseTests.java
index a1f0d9d..ca42e44 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IndexTypeParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IndexTypeParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IntegerTypeParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IntegerTypeParseTests.java
index eb71d48..ceff652 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IntegerTypeParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/IntegerTypeParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/LoadDefinitionTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/LoadDefinitionTests.java
index e8b2f5e..655654b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/LoadDefinitionTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/LoadDefinitionTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/MatchPrefixTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/MatchPrefixTests.java
index 36a0dad..e21a24d 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/MatchPrefixTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/MatchPrefixTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NamespaceScopeProcessorTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NamespaceScopeProcessorTests.java
index 591bd04..c6530ef 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NamespaceScopeProcessorTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NamespaceScopeProcessorTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NotNegativeTypeParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NotNegativeTypeParseTests.java
index 14406a6..7254d57 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NotNegativeTypeParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/NotNegativeTypeParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PackageCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PackageCommandTests.java
index 41db87c..62ecf51 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PackageCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PackageCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerfomanceTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerfomanceTests.java
index eb2dba7..1b46070 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerfomanceTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerfomanceTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerformanceParsingTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerformanceParsingTests.java
index 129f5d6..fdb4a4b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerformanceParsingTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PerformanceParsingTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/ProcCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/ProcCommandTests.java
index e7a9507..30d43b5 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/ProcCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/ProcCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PutsCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PutsCommandTests.java
index 3e7d9a1..50297bf 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PutsCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/PutsCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SetCommandParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SetCommandParseTests.java
index e61bb42..a7c473e 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SetCommandParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SetCommandParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleCodePrinterTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleCodePrinterTests.java
index 0789753..41fc266 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleCodePrinterTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SimpleCodePrinterTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SocketCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SocketCommandTests.java
index 4cbdfb6..605125f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SocketCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SocketCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchCommandTests.java
index e1ee390..2e062af 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchReduceTest.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchReduceTest.java
index e46c34d..ab2080b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchReduceTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/SwitchReduceTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclCheckerDLTKErrorComparisonTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclCheckerDLTKErrorComparisonTests.java
index 9e8da7e..009a323 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclCheckerDLTKErrorComparisonTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclCheckerDLTKErrorComparisonTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclComplexArgumentParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclComplexArgumentParseTests.java
index 8c4d93c..c475497 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclComplexArgumentParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclComplexArgumentParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclConstantsParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclConstantsParseTests.java
index eb05cd4..347202f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclConstantsParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclConstantsParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclGroupArgumentsParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclGroupArgumentsParseTests.java
index 5ec445d..d0d67e1 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclGroupArgumentsParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclGroupArgumentsParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParserTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParserTests.java
index ae03424..860f84d 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParserTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclParserTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclSwitchArgumentsParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclSwitchArgumentsParseTests.java
index 237b155..939ad29 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclSwitchArgumentsParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclSwitchArgumentsParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclTypedArgumentsParseTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclTypedArgumentsParseTests.java
index 7abc1a7..7df9ea7 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclTypedArgumentsParseTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TclTypedArgumentsParseTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestScopeProcessor.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestScopeProcessor.java
index 01ca160..828db7c 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestScopeProcessor.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestScopeProcessor.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestTclParserErrorReporter.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestTclParserErrorReporter.java
index ffc6707..136f767 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestTclParserErrorReporter.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestTclParserErrorReporter.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestUtils.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestUtils.java
index ae6662c..d00f2e5 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestUtils.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/TestUtils.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/VersionsParserTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/VersionsParserTests.java
index 0d04aba..de81e1b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/VersionsParserTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/VersionsParserTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/WhileCommandTests.java b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/WhileCommandTests.java
index b18259f..d0f03a8 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/WhileCommandTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.parser.tests/src/org/eclipse/dltk/tcl/parser/tests/WhileCommandTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2017 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
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.tests/about.html b/tcl/tests/org.eclipse.dltk.tcl.tests/about.html
index d4cc693..164f781 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/about.html
+++ b/tcl/tests/org.eclipse.dltk.tcl.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/tcl/tests/org.eclipse.dltk.tcl.tests/build.properties b/tcl/tests/org.eclipse.dltk.tcl.tests/build.properties
index 1284bfa..2f385dc 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/build.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.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/tcl/tests/org.eclipse.dltk.tcl.tests/plugin.properties b/tcl/tests/org.eclipse.dltk.tcl.tests/plugin.properties
index 919502f..77906fb 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/plugin.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.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/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/TclTestsPlugin.java b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/TclTestsPlugin.java
index 8f33a4a..268a39d 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/TclTestsPlugin.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/TclTestsPlugin.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/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/AllTests.java
index c2b4d84..57fa7ab 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/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/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/ModelTclTests.java b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/ModelTclTests.java
index 78ce4bb..30b25ca 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/ModelTclTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/ModelTclTests.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/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/TclASTBuildTests.java b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/TclASTBuildTests.java
index 2ac5852..ee30ce9 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/TclASTBuildTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/src/org/eclipse/dltk/tcl/tests/model/TclASTBuildTests.java
@@ -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/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model0/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model0/X.tcl
index 45c44bd..db03aeb 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model0/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model0/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model1/X.tcl b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model1/X.tcl
index 2841dcd..6477658 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model1/X.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/model1/X.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj0/src/module0.tcl b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj0/src/module0.tcl
index 6f96286..063246f 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj0/src/module0.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj0/src/module0.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj1/src/module0.tcl b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj1/src/module0.tcl
index a04e583..b47b405 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj1/src/module0.tcl
+++ b/tcl/tests/org.eclipse.dltk.tcl.tests/workspace/prj1/src/module0.tcl
@@ -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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/about.html b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/about.html
index d4cc693..164f781 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/about.html
+++ b/tcl/tests/org.eclipse.dltk.tcl.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/build.properties b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/build.properties
index 717fc2d..8e7bb05 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/build.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/plugin.properties b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/plugin.properties
index 79c5dbf..b9acc8b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/plugin.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/TclUITestsPlugin.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/TclUITestsPlugin.java
index f485231..2d04f7b 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/TclUITestsPlugin.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/TclUITestsPlugin.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewEmptyProjectWizardTest.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewEmptyProjectWizardTest.java
index 69af30b..da1e2f8 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewEmptyProjectWizardTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewEmptyProjectWizardTest.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectTestSetup.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectTestSetup.java
index 4b5aa91..31eac6a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectTestSetup.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectTestSetup.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardOperationTest.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardOperationTest.java
index aca8ef1..e8a6174 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardOperationTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardOperationTest.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardTest.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardTest.java
index 8c80576..4474a2a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/dialogs/NewProjectWizardTest.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/AllTests.java
index 516a95c..e3cbd4e 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/TclFoldingTest.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/TclFoldingTest.java
index d6c1197..497289a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/TclFoldingTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/folding/TclFoldingTest.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/AllTests.java
index f0bd415..7f1dd62 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/DocCmd.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/DocCmd.java
index 41b5f8f..362873d 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/DocCmd.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/SimpleIndentingTest.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/SimpleIndentingTest.java
index 76d1d25..50fa2d3 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/SimpleIndentingTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/indenting/SimpleIndentingTest.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTCLProjectWizardTest.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTCLProjectWizardTest.java
index 5beee55..13bea26 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTCLProjectWizardTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTCLProjectWizardTest.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/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTclProjectWizardPage.java b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTclProjectWizardPage.java
index 2908ab1..8e11af0 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTclProjectWizardPage.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.ui.tests/src/org/eclipse/dltk/tcl/ui/tests/wizardapi/NewTclProjectWizardPage.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/tcl/tests/org.eclipse.dltk.tcl.validators.tests/plugin.properties b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/plugin.properties
index ed707d6..165d02e 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/plugin.properties
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/plugin.properties
@@ -1,10 +1,11 @@
 #*******************************************************************************
 # * Copyright (c) 2008 xored software, Inc.  
 # *
-# * All rights reserved. This program and 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:
 # *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/internal/validators/TclValidatorTestsPlugin.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/internal/validators/TclValidatorTestsPlugin.java
index 07208a7..f812fc6 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/internal/validators/TclValidatorTestsPlugin.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/internal/validators/TclValidatorTestsPlugin.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/ArgumentsDefinitionCheckTest.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/ArgumentsDefinitionCheckTest.java
index 68721ca..cbe6391 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/ArgumentsDefinitionCheckTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/ArgumentsDefinitionCheckTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/CommandRedefinitionCheckTest.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/CommandRedefinitionCheckTest.java
index 17bb726..b12f908 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/CommandRedefinitionCheckTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/CommandRedefinitionCheckTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/UnreachableCodeCheckTest.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/UnreachableCodeCheckTest.java
index 366d6fc..9ce050a 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/UnreachableCodeCheckTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/internal/tests/UnreachableCodeCheckTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/AllTests.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/AllTests.java
index 93d65c5..b091acb 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/AllTests.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/AllTests.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/CheckMethodExistanceTest.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/CheckMethodExistanceTest.java
index 1adc0b8..35e0236 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/CheckMethodExistanceTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/CheckMethodExistanceTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/ChecksProjectTest.java b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/ChecksProjectTest.java
index e6aec82..c975e17 100644
--- a/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/ChecksProjectTest.java
+++ b/tcl/tests/org.eclipse.dltk.tcl.validators.tests/src/org/eclipse/dltk/tcl/validators/tests/ChecksProjectTest.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2008 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Andrei Sobolev)
diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/build.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/build.properties
index 37f85e2..7938450 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/build.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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
 #
 bin.includes = feature.xml,\
                eclipse_update_120.jpg,\
diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.properties
index 36c8b07..997922e 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-feature/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
diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.xml b/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.xml
index 24096d7..6b2ddd7 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.xml
+++ b/xotcl/features/org.eclipse.dltk.xotcl-feature/feature.xml
@@ -4,10 +4,12 @@
  * <copyright>
  *
  * 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
  *
  *
  * </copyright>
@@ -26,12 +28,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, 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
    </copyright>
 
    <license url="%licenseURL">
diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/notice.html b/xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/rootfiles/notice.html
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/build.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/build.properties
index a250c6b..4b4acbd 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/build.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/feature.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/feature.properties
index 283f2dc..151fafd 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/feature.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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
 #
 
 ###############################################################################
@@ -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
 #  * 
 #  
 #  *
@@ -83,7 +87,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/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/license.html b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index 79bd185..0000000
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>Eclipse DLTK Core Frameworks License</title>
-</head>
-<body lang="EN-US">
-<h1>Eclipse DLTK Core Frameworks License</h1><h3>June 5, 2008</h3>
-<ul>
-	<li>Eclipse Public License v1.0 (<a href="#epl">http://www.eclipse.org/legal/epl-v10.html</a>) for Eclipse DLTK Core Frameworks</li>
-</ul>
-
-<hr>
-
-<div name="epl" lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/about.html b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/about.html
index 7c8477f..164f781 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/about.html
+++ b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/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, 2008</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/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/about.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/about.properties
index c17213a..a6d885d 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/about.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/build.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/build.properties
index 2a3a91c..3ae0bc7 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/build.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/plugin.properties b/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/plugin.properties
index 53dd988..2887056 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl-feature/sourceTemplatePlugin/plugin.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl-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/xotcl/features/org.eclipse.dltk.xotcl.sdk/build.properties b/xotcl/features/org.eclipse.dltk.xotcl.sdk/build.properties
index 9799932..7a8f914 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl.sdk/build.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl.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/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.properties b/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.properties
index ff5b597..1ade6d0 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl.sdk/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
diff --git a/xotcl/features/org.eclipse.dltk.xotcl.sdk/rootfiles/notice.html b/xotcl/features/org.eclipse.dltk.xotcl.sdk/rootfiles/notice.html
index 74122b2..1d8ad70 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl.sdk/rootfiles/notice.html
+++ b/xotcl/features/org.eclipse.dltk.xotcl.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/xotcl/features/org.eclipse.dltk.xotcl.tests-feature/feature.properties b/xotcl/features/org.eclipse.dltk.xotcl.tests-feature/feature.properties
index 45498aa..13edfc4 100644
--- a/xotcl/features/org.eclipse.dltk.xotcl.tests-feature/feature.properties
+++ b/xotcl/features/org.eclipse.dltk.xotcl.tests-feature/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
@@ -67,7 +71,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/xotcl/plugins/org.eclipse.dltk.xotcl.core/about.html b/xotcl/plugins/org.eclipse.dltk.xotcl.core/about.html
index 7c8477f..164f781 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/about.html
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.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, 2008</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/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassCreate.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassCreate.java
index bcbfa4e..e6747da 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassCreate.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassCreate.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassNewInstance.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassNewInstance.java
index bc906c2..9aa28d6 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassNewInstance.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassNewInstance.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassProc.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassProc.java
index 91124d4..242725d 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassProc.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclClassProc.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclModelDetector.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclModelDetector.java
index a0e500f..0eae21c 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclModelDetector.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclModelDetector.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclNames.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclNames.java
index d3fc976..a16ca34 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclNames.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclNames.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectCreate.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectCreate.java
index e97efd9..d82fd25 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectCreate.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectCreate.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectSet.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectSet.java
index fae1a6e..4085583 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectSet.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclObjectSet.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclType.java b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclType.java
index 7d437d4..a649e50 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclType.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.core/src/org/eclipse/dltk/xotcl/internal/core/parser/structure/XOTclType.java
@@ -1,10 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009 xored software, Inc.  
  *
- * All rights reserved. This program and 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:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/about.html b/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/about.html
index 7c8477f..164f781 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/about.html
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/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, 2008</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/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/plugin.properties b/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/plugin.properties
index df4addf..ce3cb38 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/plugin.properties
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.testing.xounit/plugin.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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/about.html b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/about.html
index 7c8477f..164f781 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/about.html
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.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, 2008</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/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/documentation/XOTclDocumentationProvider.java b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/documentation/XOTclDocumentationProvider.java
index 02bb19d..c695894 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/documentation/XOTclDocumentationProvider.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/documentation/XOTclDocumentationProvider.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/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclNewFileWizard.java b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclNewFileWizard.java
index 1e7d338..f68e101 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclNewFileWizard.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclNewFileWizard.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/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.java b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.java
index 92051ca..c4eb069 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.java
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.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/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.properties b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.properties
index 098110a..76d7555 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.properties
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl.ui/src/org/eclipse/dltk/xotcl/internal/ui/wizards/XOTclWizardMessages.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/xotcl/plugins/org.eclipse.dltk.xotcl/about.html b/xotcl/plugins/org.eclipse.dltk.xotcl/about.html
index 7c8477f..164f781 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl/about.html
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl/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, 2008</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/xotcl/plugins/org.eclipse.dltk.xotcl/about.properties b/xotcl/plugins/org.eclipse.dltk.xotcl/about.properties
index 26bff6e..b4477ab 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl/about.properties
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl/about.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# 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
diff --git a/xotcl/plugins/org.eclipse.dltk.xotcl/plugin.properties b/xotcl/plugins/org.eclipse.dltk.xotcl/plugin.properties
index b579fd0..2c96f37 100644
--- a/xotcl/plugins/org.eclipse.dltk.xotcl/plugin.properties
+++ b/xotcl/plugins/org.eclipse.dltk.xotcl/plugin.properties
@@ -1,9 +1,11 @@
 ###############################################################################
 # Copyright (c) 2000, 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
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/src/org/eclipse/dltk/xotcl/core/tests/model/XOTclSelectionTests.java b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/src/org/eclipse/dltk/xotcl/core/tests/model/XOTclSelectionTests.java
index d472de2..19bcc2a 100644
--- a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/src/org/eclipse/dltk/xotcl/core/tests/model/XOTclSelectionTests.java
+++ b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/src/org/eclipse/dltk/xotcl/core/tests/model/XOTclSelectionTests.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/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection001.tcl b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection001.tcl
index 458af77..7bcb4a7 100644
--- a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection001.tcl
+++ b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection001.tcl
@@ -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/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection002.tcl b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection002.tcl
index 0d32154..14aae84 100644
--- a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection002.tcl
+++ b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection002.tcl
@@ -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/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection003.tcl b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection003.tcl
index 189822d..285c138 100644
--- a/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection003.tcl
+++ b/xotcl/tests/org.eclipse.dltk.xotcl.core.tests/workspace/Selection/src/selection003.tcl
@@ -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
 #
 
 ###############################################################################