diff --git a/LICENSE b/LICENSE
index 3260e4f239a6dac9f7d09f34ea731b1fbfc03a1e..3534f2ff9d512c471aab17543d08c32a1110b32d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,204 +1,277 @@
-Eclipse Public License - v 1.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 code and documentation
-   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 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.
-
-"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,
-including all Contributors.
-
-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, in source code and object code form.
-  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 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.
-  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.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
-  a) it complies with the terms and conditions of this Agreement; and
-  b) its license agreement:
-      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;
-     ii) effectively excludes on behalf of all Contributors all liability for
-         damages, including direct, indirect, special, incidental and
-         consequential damages, such as lost profits;
-    iii) states that any provisions which differ from this Agreement are
-         offered by that Contributor alone and not by any other party; and
-     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.
-
-When the Program is made available in source code form:
-
-  a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
-     Contributors may not remove or alter any copyright notices contained
-     within the Program.
-
-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.
-
-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, 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, 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.
-
-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.
-
+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/demo/DIAMETER_Demo.ttcn b/demo/DIAMETER_Demo.ttcn
index 581046362fb989d1b4c8a0ebb379c7b54e0976af..b9da1478f204a9e76d9122dabc39c2495dd27b05 100644
--- a/demo/DIAMETER_Demo.ttcn
+++ b/demo/DIAMETER_Demo.ttcn
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/demo/DIAMETER_Mapping.ttcn b/demo/DIAMETER_Mapping.ttcn
index 0ac8a6217a2cdfd6e7ea5b7230dd9871f13b9b7c..99333db499470dcd74719d57ff40adc11a571693 100644
--- a/demo/DIAMETER_Mapping.ttcn
+++ b/demo/DIAMETER_Mapping.ttcn
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/demo/DIAMETER_SCTP_Client_Demo.cfg b/demo/DIAMETER_SCTP_Client_Demo.cfg
index 577546135670948bec3db75246979e261bfe4b74..f9d67c8308092a89c17a2ec2c77122f6c7636eae 100644
--- a/demo/DIAMETER_SCTP_Client_Demo.cfg
+++ b/demo/DIAMETER_SCTP_Client_Demo.cfg
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/demo/DIAMETER_SCTP_Server_Demo.cfg b/demo/DIAMETER_SCTP_Server_Demo.cfg
index 4b1f99f6075122b92bc0a829dcc28ca885a324d2..b407d6b2216ddf616d11653c4a8d2808dca8bb73 100644
--- a/demo/DIAMETER_SCTP_Server_Demo.cfg
+++ b/demo/DIAMETER_SCTP_Server_Demo.cfg
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/demo/DIAMETER_TCP_Client_Demo.cfg b/demo/DIAMETER_TCP_Client_Demo.cfg
index a41fe9ff430c5f45bba3f15c1cd545d68047554d..5f482ea1d99039b13c2460719e2ecfecc304553a 100644
--- a/demo/DIAMETER_TCP_Client_Demo.cfg
+++ b/demo/DIAMETER_TCP_Client_Demo.cfg
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/demo/DIAMETER_TCP_Server_Demo.cfg b/demo/DIAMETER_TCP_Server_Demo.cfg
index 0f2d0ac26cc2dfdb6de4bad342218095dc62cfb3..0ed3914d7cfe51f176ba6a6502e4113471e2c9d9 100644
--- a/demo/DIAMETER_TCP_Server_Demo.cfg
+++ b/demo/DIAMETER_TCP_Server_Demo.cfg
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/demo/DIAMETER_Types.ttcn b/demo/DIAMETER_Types.ttcn
index 66f83d24b3aef4ec176aaa1aa52eb7fdf8a39570..c9a5a304c60acaae7e19d4f704f67471abdf96c7 100644
--- a/demo/DIAMETER_Types.ttcn
+++ b/demo/DIAMETER_Types.ttcn
@@ -2,11 +2,11 @@
 // AVP.sh BaseTypes_IETF_RFC3588.ddf Base_IETF_RFC3588.ddf Ericsson_Specific_AVPs.ddf
 module DIAMETER_Types {
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
@@ -235,11 +235,11 @@ variant (message_length) "LENGTHTO(version, message_length,
 command_code, application_id, hop_by_hop_id, end_to_end_id, avps)";
 }
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
@@ -628,11 +628,11 @@ type AVP_Unsigned32 BASE_NONE_Vendor_Id
 type AVP_Grouped BASE_NONE_Vendor_Specific_Application_Id 
 
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/demo/DIAMETER_demo.tpd b/demo/DIAMETER_demo.tpd
index e6a900d8605c0eac9edf4d38333a7ae203855afc..9499b0e57c8a7c616b92fe674f879626ec71f7e6 100644
--- a/demo/DIAMETER_demo.tpd
+++ b/demo/DIAMETER_demo.tpd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2014 Ericsson
+ Copyright (c) 2000-2018 Ericsson Telecom AB
 
   All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v1.0
+  are made available under the terms of the Eclipse Public License v2.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/legal/epl-v10.html
+  https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  -->
 <TITAN_Project_File_Information version="1.0">
   <ProjectName>DIAMETER_demo</ProjectName>
diff --git a/demo/demo_note.txt b/demo/demo_note.txt
index 36e00f18af5b8ad7bf24a93c08a5a875797fde43..a0eb9c191956484e6e971390fa04d70f53c5cbed 100644
--- a/demo/demo_note.txt
+++ b/demo/demo_note.txt
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_940.ddf b/src/AAAInterface_3GPP_TS29272_940.ddf
index 8accb6028918e472c72b09e534d87ededae72bd6..b5bf5bb2c1f6d1759c25de8723894ec14e71d9d3 100644
--- a/src/AAAInterface_3GPP_TS29272_940.ddf
+++ b/src/AAAInterface_3GPP_TS29272_940.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_950.ddf b/src/AAAInterface_3GPP_TS29272_950.ddf
index 584b858041572ec917ec2da191ab6d4d68b8ac02..8ecc2ba04f685ab4af4d181dc56ac06cc7722c93 100644
--- a/src/AAAInterface_3GPP_TS29272_950.ddf
+++ b/src/AAAInterface_3GPP_TS29272_950.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_970.ddf b/src/AAAInterface_3GPP_TS29272_970.ddf
index e35c46f6350bf5ccf2ec3b081e47994de363288c..2c6bf1f90ac83a3653de9c56d449e2ca9f83be45 100644
--- a/src/AAAInterface_3GPP_TS29272_970.ddf
+++ b/src/AAAInterface_3GPP_TS29272_970.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_a30.ddf b/src/AAAInterface_3GPP_TS29272_a30.ddf
index f6693dfbc80b8d5abfd8ffa7d2215a9af287afc1..af0f08b5605e197f982a96c614a0829255ef21a1 100644
--- a/src/AAAInterface_3GPP_TS29272_a30.ddf
+++ b/src/AAAInterface_3GPP_TS29272_a30.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_a60.ddf b/src/AAAInterface_3GPP_TS29272_a60.ddf
index 6ff3e0cbea75e0241731ff494c402779de782bb4..61aa6b680887cbc49b1c5d20f3e99602361c6f6b 100644
--- a/src/AAAInterface_3GPP_TS29272_a60.ddf
+++ b/src/AAAInterface_3GPP_TS29272_a60.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_b60.ddf b/src/AAAInterface_3GPP_TS29272_b60.ddf
index a6ee726350c4a3f30d2e43d2fc217771838779a0..e581977953a25ae2e504c9428a8991ad0bb582d4 100644
--- a/src/AAAInterface_3GPP_TS29272_b60.ddf
+++ b/src/AAAInterface_3GPP_TS29272_b60.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29272_bd0.ddf b/src/AAAInterface_3GPP_TS29272_bd0.ddf
index 90055642524202e10aa0c6347532aecf604fb336..c3c040c9f27d2937f7ee6f0757608c95e2843054 100644
--- a/src/AAAInterface_3GPP_TS29272_bd0.ddf
+++ b/src/AAAInterface_3GPP_TS29272_bd0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2015  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Timea Moder - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29273_840.ddf b/src/AAAInterface_3GPP_TS29273_840.ddf
index 50d0d42d9b6525e49a1e28b0d80b7be3ed95bf6f..234365eb2e0c0fda5802b886a6a5033c30395475 100644
--- a/src/AAAInterface_3GPP_TS29273_840.ddf
+++ b/src/AAAInterface_3GPP_TS29273_840.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29273_940.ddf b/src/AAAInterface_3GPP_TS29273_940.ddf
index a3adf2e729785f43a3b0eb8783c7ea1c9db10af0..1d2487b0fe7c75fa1adb065249e96038ae7bbde2 100644
--- a/src/AAAInterface_3GPP_TS29273_940.ddf
+++ b/src/AAAInterface_3GPP_TS29273_940.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AAAInterface_3GPP_TS29273_b30.ddf b/src/AAAInterface_3GPP_TS29273_b30.ddf
index 468eceafbae7b9356727141cc8ffeb282cff7ff2..32c02249a2f28dad28e906528b4c3cae49cacb9b 100644
--- a/src/AAAInterface_3GPP_TS29273_b30.ddf
+++ b/src/AAAInterface_3GPP_TS29273_b30.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AVP.awk b/src/AVP.awk
index 00eb8a7a00bbe0889110f3fc8cc8edb845e44855..6e566c18e7a8e8b0270a53bce93231502bc551b3 100755
--- a/src/AVP.awk
+++ b/src/AVP.awk
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2004, 2014  Ericsson AB
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 # Contributors:
 #   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AVP.sh b/src/AVP.sh
index 6744c922d8b80777847042e7d755036b3a751791..6e523097d968025c40ea0c17559f8012a8e8eb19 100755
--- a/src/AVP.sh
+++ b/src/AVP.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 2004, 2014  Ericsson AB
+# Copyright (c) 2000-2018 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 # Contributors:
 #   Roland Gecse - initial implementation and initial documentation
diff --git a/src/AVP_encdec.awk b/src/AVP_encdec.awk
index 08335946498345febabfbf88de58967d7de30bc6..6393ac831ea3f008388984b9d4695f2d399c3e13 100644
--- a/src/AVP_encdec.awk
+++ b/src/AVP_encdec.awk
@@ -1,9 +1,9 @@
 ###############################################################################
 # Copyright (c) 2004, 2014  Ericsson AB
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 # Contributors:
 #   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Acision_Specific.ddf b/src/Acision_Specific.ddf
index ff5b915d358911303065f1d04040bd018cc845f4..29127a54f8c739c6b89e9f11ffad6fb86857c429 100644
--- a/src/Acision_Specific.ddf
+++ b/src/Acision_Specific.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Alcatel_Lucent_Specific_AVPs.ddf b/src/Alcatel_Lucent_Specific_AVPs.ddf
index b9888281710c1043da6c1e5425a62830a7687857..35a2a7ece3f956575f8cd39f4c3ccd86c1c90ba0 100644
--- a/src/Alcatel_Lucent_Specific_AVPs.ddf
+++ b/src/Alcatel_Lucent_Specific_AVPs.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/BaseTypes_IETF_RFC3588.ddf b/src/BaseTypes_IETF_RFC3588.ddf
index 5aa628417f24c5ac87c9c5c8a4a67e16bf17fb01..e09917a0036f135527f550e87416294726f592ad 100644
--- a/src/BaseTypes_IETF_RFC3588.ddf
+++ b/src/BaseTypes_IETF_RFC3588.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Base_IETF_RFC3588.ddf b/src/Base_IETF_RFC3588.ddf
index bba3fcb527581f8ff4c20c4c2e037b63c38353d6..a93611ccbaf3e9c9c741eed479cebd8e3a880069 100644
--- a/src/Base_IETF_RFC3588.ddf
+++ b/src/Base_IETF_RFC3588.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CLCInterface_Vodafone_Rev2.ddf b/src/CLCInterface_Vodafone_Rev2.ddf
index 99662a25f26a1bedc260ba2a1e68a7be54f0f648..63e31e952029392e3c3264c6833529bcfa6cdb4b 100644
--- a/src/CLCInterface_Vodafone_Rev2.ddf
+++ b/src/CLCInterface_Vodafone_Rev2.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_850.ddf b/src/ChargingApplications_3GPP_TS32299_850.ddf
index 341bff9e672aead8d5fe415b0e0b61c2d4fe6502..b64212042c4b395a30a3ad39fa60eed17482281a 100644
--- a/src/ChargingApplications_3GPP_TS32299_850.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_850.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_870.ddf b/src/ChargingApplications_3GPP_TS32299_870.ddf
index 02e46ce043e1101c658494a1c82e7bc7a65eff95..e74aab70ff494b3aa7f2360c96dee3f5efe5e6b2 100644
--- a/src/ChargingApplications_3GPP_TS32299_870.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_870.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_900.ddf b/src/ChargingApplications_3GPP_TS32299_900.ddf
index 779687a6c867f08576a0d25073962fcdb5bde544..dda150b7269a96d29a09e9460a09712c8d3e0bf9 100644
--- a/src/ChargingApplications_3GPP_TS32299_900.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_900.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_940.ddf b/src/ChargingApplications_3GPP_TS32299_940.ddf
index f00db1bed8d8fb79c93b1036016f12d7b12dea74..3c53d81dd881b759d27def9d4095f9461b92ff3f 100644
--- a/src/ChargingApplications_3GPP_TS32299_940.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_940.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_9b0.ddf b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
index d9c06d2a1cf33fda4af451bc41a8e4d61031bfdf..2736af2335c622d7e77628c087f40f4773d930b7 100644
--- a/src/ChargingApplications_3GPP_TS32299_9b0.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_9b0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
index cc6f793f30ac183fd2590aebb8654fa407f86f1b..c8ba509a280a03bf226b1adb97807ce916c7e362 100644
--- a/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_AdviceOfCharge.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_a60.ddf b/src/ChargingApplications_3GPP_TS32299_a60.ddf
index 5d0d99730e3377ab3c9686656fbd9ffd06037180..fdedeec2af8d1629e1235a2d5e0d9ec5e1b47077 100644
--- a/src/ChargingApplications_3GPP_TS32299_a60.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_a60.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ChargingApplications_3GPP_TS32299_be0.ddf b/src/ChargingApplications_3GPP_TS32299_be0.ddf
index d37256de982d308c8d27090d7badd4d29b4d6797..bf2461ddb17d0f630f30f85aa702baa36ed7a9e3 100644
--- a/src/ChargingApplications_3GPP_TS32299_be0.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_be0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2015  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Timea Moder - initial implementation
diff --git a/src/ChargingApplications_3GPP_TS32299_c60.ddf b/src/ChargingApplications_3GPP_TS32299_c60.ddf
index 4221e4db58c042e4993591646bef6fa1c71b3f17..756d2a2ef76eafb0282ede6410f6f334da89f1a1 100644
--- a/src/ChargingApplications_3GPP_TS32299_c60.ddf
+++ b/src/ChargingApplications_3GPP_TS32299_c60.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CreditControl_IETF_RFC4006.ddf b/src/CreditControl_IETF_RFC4006.ddf
index 21ad0ebd623e71842667aa3f83c1b29be88e1e4b..177d218524cd22cff636651212b5d84ed6b3eab4 100644
--- a/src/CreditControl_IETF_RFC4006.ddf
+++ b/src/CreditControl_IETF_RFC4006.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CxDxInterface_3GPP_TS29229_6a0.ddf b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
index e4d7bd3a83ca6ba96af244a7efe383260158275d..a8db9d87587bcd9a80440dfed0c6767cfa0a5e0b 100644
--- a/src/CxDxInterface_3GPP_TS29229_6a0.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_6a0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CxDxInterface_3GPP_TS29229_840.ddf b/src/CxDxInterface_3GPP_TS29229_840.ddf
index 90505cc6a92f3f5bdf0620b82a9d6d9ed3a8cc78..8c9470cf795623fb64eea682a15f62e9795d8b90 100644
--- a/src/CxDxInterface_3GPP_TS29229_840.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_840.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CxDxInterface_3GPP_TS29229_880.ddf b/src/CxDxInterface_3GPP_TS29229_880.ddf
index e6c3eedd521d072a3fc55d6b376de011bd4ef933..3cef85245eecf27630150b89c8fc191ef6f535d1 100644
--- a/src/CxDxInterface_3GPP_TS29229_880.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_880.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CxDxInterface_3GPP_TS29229_920.ddf b/src/CxDxInterface_3GPP_TS29229_920.ddf
index 13fdbea3e61dd997abaa4198cdc77bd6bc2e6e5d..f0ca0c4ec72a02fb10179eb4211da9116cc6f325 100644
--- a/src/CxDxInterface_3GPP_TS29229_920.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_920.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/CxDxInterface_3GPP_TS29229_c30.ddf b/src/CxDxInterface_3GPP_TS29229_c30.ddf
index e65130f0ca04dbb743c02a34af7f4e1a163c883d..7d1e9c7bcae08508ae4db3e3a3246981806c24b3 100644
--- a/src/CxDxInterface_3GPP_TS29229_c30.ddf
+++ b/src/CxDxInterface_3GPP_TS29229_c30.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
diff --git a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
index 88716355489079341246759af80e390d1a569dc5..4d134d219c4276d25c6318fc16551fb49847b9de 100644
--- a/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
+++ b/src/CxDxInterface_Ericsson_1551_FAY301_0059_PC26.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/DIAMETER_EncDec.cc b/src/DIAMETER_EncDec.cc
index cb523de70ad986dfff0da45c3174f6acaca7f205..b61207e678957bfcae0f5741d20fda5dfe1acbe5 100644
--- a/src/DIAMETER_EncDec.cc
+++ b/src/DIAMETER_EncDec.cc
@@ -1,9 +1,9 @@
 /******************************************************************************
-* Copyright (c) 2004, 2014  Ericsson AB
+* Copyright (c) 2000-2018 Ericsson Telecom AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/DIAMETER_EncDec.tpl b/src/DIAMETER_EncDec.tpl
index 5829102da7e8f4dc43f5a25b6331e7c23d55da71..14ff1849bbcaec4609eed9153d99d099dd543bd1 100644
--- a/src/DIAMETER_EncDec.tpl
+++ b/src/DIAMETER_EncDec.tpl
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
index f8a706bf02bbe3bf70efd891790a0b47b18d227d..6b46ab8dc118df15c3e06e692af2318978e9f529 100644
--- a/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
+++ b/src/DelegatedIPv6Prefix_IETF_RFC4818.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2015  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Timea Moder
diff --git a/src/DigestAuthentication_IETF_RFC5090.ddf b/src/DigestAuthentication_IETF_RFC5090.ddf
index 44acf308c0bb11a49be442de2427b5071e64f5e5..907eb855e83081dacc51ca4fedd48ee42a5d85bb 100644
--- a/src/DigestAuthentication_IETF_RFC5090.ddf
+++ b/src/DigestAuthentication_IETF_RFC5090.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/EricssonSCAPv1_1553APR_10148.ddf b/src/EricssonSCAPv1_1553APR_10148.ddf
index cee4879038d086da44a375c734d16f64781472b9..48a1916511b1b218f00c15d268daed7f02c04ea4 100644
--- a/src/EricssonSCAPv1_1553APR_10148.ddf
+++ b/src/EricssonSCAPv1_1553APR_10148.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Ericsson_Specific_AVPs.ddf b/src/Ericsson_Specific_AVPs.ddf
index 81d798828cb8c9dac9888bd0979503cc758f80c2..ae58216aab7871770eced1509122d53bebc3e30f 100644
--- a/src/Ericsson_Specific_AVPs.ddf
+++ b/src/Ericsson_Specific_AVPs.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf b/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf
index ee39725059b1c59ee5233a4cb575631415d2a0cf..838dc6a53502344ccc4cb4e5c81ddb794dd3f21c 100644
--- a/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf
+++ b/src/ExtensibleAuthenticationProtocol_IETF_RFC4072.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiInterface_3GPP_TS29061_770.ddf b/src/GiInterface_3GPP_TS29061_770.ddf
index aff653c75e157e41453b4b248cc871e063dbebe6..ab81b01d25ea34c2ea5b4c3892d54c565d2f8b62 100644
--- a/src/GiInterface_3GPP_TS29061_770.ddf
+++ b/src/GiInterface_3GPP_TS29061_770.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiSGiInterface_3GPP_TS29061_810.ddf b/src/GiSGiInterface_3GPP_TS29061_810.ddf
index 40d52bbf816050d2910f79f90cf7def6cf91d457..929beaae82bf6b70faeb19399ad0a1be3cbcb9ad 100644
--- a/src/GiSGiInterface_3GPP_TS29061_810.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_810.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiSGiInterface_3GPP_TS29061_930.ddf b/src/GiSGiInterface_3GPP_TS29061_930.ddf
index 603651edaf5955424594854d4a4e1a2ed8cf4f2c..1dbf42dde24602f4178c368eaa65f375b86bc6d7 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_930.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
index 82b8d2e8a42f11844b6118a04eb57c8df3e4e2a0..f2386a16d89b3da24ef84c199ea88d6aba8ffa55 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.tpl b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.tpl
index 376d93d385a53ff13a592e36dc13fb036583e9f7..894bfeffc7067430a81ceea1fa93f4fd53abb1e5 100644
--- a/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.tpl
+++ b/src/GiSGiInterface_3GPP_TS29061_930_QoS_Detailed.tpl
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiSGiInterface_3GPP_TS29061_980.ddf b/src/GiSGiInterface_3GPP_TS29061_980.ddf
index e4de48fc8d97137943762655df1540a934f07d87..30270fb3e53dea200c254042cd5fcf4da4d88957 100644
--- a/src/GiSGiInterface_3GPP_TS29061_980.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_980.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90.ddf b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
index 6327686012f89b30f0e3ab5c8513b10de3ebc6d5..a1504fc3faae0da98bdb67fede794c7929378491 100644
--- a/src/GiSGiInterface_3GPP_TS29061_b90.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_b90.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2015  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Timea Moder
diff --git a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
index 5edee895ff0415111fc6ec6b1b4556fafd356b71..535bb7b3a5e2e2e48fcfda4c118d4e59c8bd3ba2 100644
--- a/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
+++ b/src/GiSGiInterface_3GPP_TS29061_b90_QoS_Detailed.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Timea Moder
diff --git a/src/GmbInterface_3GPP_TS29061_6f0.ddf b/src/GmbInterface_3GPP_TS29061_6f0.ddf
index a27b8d6470d28a3a902ad086dc04df4cc003097b..6182cddcabba0447af282f16ea0557788ebf349c 100644
--- a/src/GmbInterface_3GPP_TS29061_6f0.ddf
+++ b/src/GmbInterface_3GPP_TS29061_6f0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GmbInterface_3GPP_TS29061_720.ddf b/src/GmbInterface_3GPP_TS29061_720.ddf
index 19767d6e13a02c6bad0b6ff8b428ebb0df831538..1358ee0185e768c181900ab3f0f9be7ec96b99af 100644
--- a/src/GmbInterface_3GPP_TS29061_720.ddf
+++ b/src/GmbInterface_3GPP_TS29061_720.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GmbInterface_3GPP_TS29061_810.ddf b/src/GmbInterface_3GPP_TS29061_810.ddf
index facf2e1911012636f585e5090a165a980815caed..553807d95c011cfd195ff270f64b28228679a65b 100644
--- a/src/GmbInterface_3GPP_TS29061_810.ddf
+++ b/src/GmbInterface_3GPP_TS29061_810.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GmbInterface_3GPP_TS29061_930.ddf b/src/GmbInterface_3GPP_TS29061_930.ddf
index 386b4d3a1cdd4e4110c5d3f1954477c76a1faafa..240dbf1fc3fa160776aa1ccdc7dceae1629037cc 100644
--- a/src/GmbInterface_3GPP_TS29061_930.ddf
+++ b/src/GmbInterface_3GPP_TS29061_930.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GmbInterface_3GPP_TS29061_970.ddf b/src/GmbInterface_3GPP_TS29061_970.ddf
index 5b3d411c1dc3ee7851322cda77df63ab5c5cd44d..618334641930fb69ccacce93201092edd8461421 100644
--- a/src/GmbInterface_3GPP_TS29061_970.ddf
+++ b/src/GmbInterface_3GPP_TS29061_970.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GmbInterface_3GPP_TS29061_980.ddf b/src/GmbInterface_3GPP_TS29061_980.ddf
index 2efef1d898da5da4dcd9be36b885a0925ceb0efc..88d2262a27a30c5b73fb4619d0c275cea43da489 100644
--- a/src/GmbInterface_3GPP_TS29061_980.ddf
+++ b/src/GmbInterface_3GPP_TS29061_980.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GqInterface_PC_3GPP_TS29209_670.ddf b/src/GqInterface_PC_3GPP_TS29209_670.ddf
index 6d48feda0409fcc28f3f5654ead53903960ae0d7..6fa6788d0f261769367d25c0321981bd49bbba35 100644
--- a/src/GqInterface_PC_3GPP_TS29209_670.ddf
+++ b/src/GqInterface_PC_3GPP_TS29209_670.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GqInterface_S3_ETSI_TS183017_231.ddf b/src/GqInterface_S3_ETSI_TS183017_231.ddf
index a60aa61019b61829c7090c32dc719c59c2aa5e0e..4b0014eaa4605e7608e2429494f6a7240f3034fd 100644
--- a/src/GqInterface_S3_ETSI_TS183017_231.ddf
+++ b/src/GqInterface_S3_ETSI_TS183017_231.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_CRP_3GPP_TS29210_670.ddf b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
index 6b5f7767ed7f4b8ca59e3aee72ec38fb78d442e3..859d90713836e93964da660ee1219c77f3334f31 100644
--- a/src/GxInterface_CRP_3GPP_TS29210_670.ddf
+++ b/src/GxInterface_CRP_3GPP_TS29210_670.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_740.ddf b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
index 45b7508f14f517d6a5581ad6c13c0fce75e582c6..cf5025344c776bed5b4ada97a515998f3ded6e79 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_740.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_740.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_820.ddf b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
index 40de8d4f0ca782183ef08a4456e20a219a05ccf9..fd9ceeb2338d7612c24669ac8c62a892e92f3344 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_820.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_820.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_830.ddf b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
index 94d1fbadc01408c9736eba76c14bff47f6d0e785..b564cfd69f0342f8cfab36559021ce1271000472 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_830.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_830.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_840.ddf b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
index de848a1dba95a006110f338ef9a547f93ed0e03d..cb937d84fc80fb892101393d57431d617b29d712 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_840.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_840.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
index afbcd6f23a8930b5850506a070fc7e474e5aad30..eab4a8f20163a26a7a5f30366abb278156d564d0 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_8a0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
index b8bc3c7cd6c0734493b0ec3015aaf8efa550afcf..e147cb0fd48b32c17aa2a1b3e1a706d53f04a042 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_8b1.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_910.ddf b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
index bca43e3aacdf65b68b4c8c67951fe430f2b9d1a6..79c081cecd5a001ef693777fdc9f17eb9316fce7 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_910.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_910.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_930.ddf b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
index 98e8f718fcf86ff32ee4d2fa86444beb73bb4391..a379029ff242ab71131ac6b3d14b222349d0dd8d 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_930.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_930.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_970.ddf b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
index fd832eaf271d0c2fb7a92cd2271bf1421963f8d6..67529a3be7b521bf8c5920879e950fb265b229f4 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_970.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_970.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
index 4088edf738ecba935361c10f9a3a6df35b9ba345..0252eae7578339cd605d041f2cd473a096cc7b72 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_9b0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
index 0864f80d91b939f987e72cbd9fedfd380ecb3e4e..c7a029d62f774f5b38c92b19b3e662e6459f34ed 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_aa0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
index 51d431c98a15c54da06d23f71bd6082d12b59cb3..a1079ca71b47b962e69e7f1bba0e9d61a3bd072d 100644
--- a/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
+++ b/src/GxInterface_PCC_3GPP_TS29212_c52.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
index b539dbc9fc7def176df801b476bdba8b1da32ac5..534085a0030e99d3060c362f892110971ea1c2e3 100644
--- a/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
+++ b/src/GxaInterface_3GPP2_X_S0057_0_300.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/MobileIPv4_Application_IETF_RFC4004.ddf b/src/MobileIPv4_Application_IETF_RFC4004.ddf
index d8dcea0b760747113afbdb445042f8742adface8..bfe2db33a0f5cce3c9197698996a553dd393bfd2 100644
--- a/src/MobileIPv4_Application_IETF_RFC4004.ddf
+++ b/src/MobileIPv4_Application_IETF_RFC4004.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/MobileIPv6_HAAA_IETF_RFC5779.ddf b/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
index 71a035dec9013441cf1be3decfe2d12dec44b40c..0cf6d5ab4d6db9c403dde5c4df7aaae704f0c24b 100644
--- a/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
+++ b/src/MobileIPv6_HAAA_IETF_RFC5779.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/MobileIPv6_HA_IETF_RFC5778.ddf b/src/MobileIPv6_HA_IETF_RFC5778.ddf
index 4ca69688bb2d423fb30bb1e789cf6af49ae25630..518714334c343cc59c62b499849c26e52f5f494e 100644
--- a/src/MobileIPv6_HA_IETF_RFC5778.ddf
+++ b/src/MobileIPv6_HA_IETF_RFC5778.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/MobileIPv6_NAS_IETF_RFC5447.ddf b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
index 0c06dbc06af7b1b1dc2812e2ffab69ad1862e840..def75d15a4c54f79b36813c1661caec30a3e8fd2 100644
--- a/src/MobileIPv6_NAS_IETF_RFC5447.ddf
+++ b/src/MobileIPv6_NAS_IETF_RFC5447.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
index f8e8632cdd3ed8359a07e51439f068adc941746b..b69f9f41422ff1c5cd98b1af5f3dae4008c019ac 100644
--- a/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
+++ b/src/NGN_NetworkAccesses_ETSI_ES183020_111.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/NetworkAccessServer_IETF_RFC4005.ddf b/src/NetworkAccessServer_IETF_RFC4005.ddf
index bb25ad433d7f395597c4cdca77e3818af0b0a2e8..5da2d91aa70ea831f05ce63347e47977e8d639fb 100644
--- a/src/NetworkAccessServer_IETF_RFC4005.ddf
+++ b/src/NetworkAccessServer_IETF_RFC4005.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RqInterface_ETSI_ES283026_241.ddf b/src/RqInterface_ETSI_ES283026_241.ddf
index 7d24c90ad5b4140e9876e1adde91e15b3be73f16..ff4b0360e34a1d051c150be560324833aec284da 100644
--- a/src/RqInterface_ETSI_ES283026_241.ddf
+++ b/src/RqInterface_ETSI_ES283026_241.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RxInterface_PCC_3GPP_TS29214_830.ddf b/src/RxInterface_PCC_3GPP_TS29214_830.ddf
index 91c4506632fc26791e81f0eddf56936294e16908..0720d5c2b23d1815a669d6364afbf541e05f8ebc 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_830.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_830.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
index 1c240a9c981218205af78027d982c13b7260b9a3..f8ea3bb4848766b7871bb1d0e69b6cd8c04551a2 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_8a0.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RxInterface_PCC_3GPP_TS29214_990.ddf b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
index a9408282365ca5a206098f03a7c4be760706bde6..ee74db71856c9137ad897eec98c19c4bc7f086de 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_990.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_990.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
index fc798ea66e4b30ace789097f5ede33d9667f70e3..3c72c76c1046e927b6424097a72d67e2d5888dfc 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_a70.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
index c99108bacc777b53304ea3c3fc4ea71b62e14f68..cf854921d0a15c8ddd5e2282801c37b6595950c4 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_c10.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
index 801b3b9965d57b1cfa6b554e07e5a4354dcacc17..5a0e8cf0b4a793544fa11dc67def234c32546347 100644
--- a/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
+++ b/src/RxInterface_PCC_3GPP_TS29214_d10.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2015  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Gabor Szalai - initial implementation
diff --git a/src/S9Interface_3GPP_TS29215_b40.ddf b/src/S9Interface_3GPP_TS29215_b40.ddf
index 29a95a0191a1802e356370d91da7c354d15876e4..61974a047103db65f4950b2df5377d6d645f39a4 100644
--- a/src/S9Interface_3GPP_TS29215_b40.ddf
+++ b/src/S9Interface_3GPP_TS29215_b40.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/SGmbInterface_3GPP_TS29061_940.ddf b/src/SGmbInterface_3GPP_TS29061_940.ddf
index 9367c2fdb153d639904e2e6a86e407916a98f418..108c70b2cdb7966adbd6c27c3cdfd74c37627a95 100644
--- a/src/SGmbInterface_3GPP_TS29061_940.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_940.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/SGmbInterface_3GPP_TS29061_980.ddf b/src/SGmbInterface_3GPP_TS29061_980.ddf
index 29dd351e34478a2be298c03fee3d50fe1d29444f..ac72b05a1284b7a5a67d4d49c70dccea652444c2 100644
--- a/src/SGmbInterface_3GPP_TS29061_980.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_980.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/SGmbInterface_3GPP_TS29061_b90.ddf b/src/SGmbInterface_3GPP_TS29061_b90.ddf
index 65050a8403cadb8e5029ea4a577297d5d65297de..694f37d7429ae6e76bbcacedbbaf8abc818eaf85 100644
--- a/src/SGmbInterface_3GPP_TS29061_b90.ddf
+++ b/src/SGmbInterface_3GPP_TS29061_b90.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2015  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Timea Moder
diff --git a/src/ShInterface_3GPP_TS29329_620.ddf b/src/ShInterface_3GPP_TS29329_620.ddf
index e49954c43adabee6f9f66d94e5eace847ef6e6ff..60be8bdc59da93f0c981f6858321ea56c1cd09a4 100644
--- a/src/ShInterface_3GPP_TS29329_620.ddf
+++ b/src/ShInterface_3GPP_TS29329_620.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ShInterface_3GPP_TS29329_750.ddf b/src/ShInterface_3GPP_TS29329_750.ddf
index 1a9c21c98a88807f336520fdd28fb5181aaf2cc2..3dd5c4a8488cf894f422aa7d63c18123ab9adc93 100644
--- a/src/ShInterface_3GPP_TS29329_750.ddf
+++ b/src/ShInterface_3GPP_TS29329_750.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ShInterface_3GPP_TS29329_820.ddf b/src/ShInterface_3GPP_TS29329_820.ddf
index 0a9adac2f6bd024c938eadc7d93caaa1a227df7c..68c9b63fead7a7dc129606a6c0f99fe1d84c369d 100644
--- a/src/ShInterface_3GPP_TS29329_820.ddf
+++ b/src/ShInterface_3GPP_TS29329_820.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ShInterface_3GPP_TS29329_a30.ddf b/src/ShInterface_3GPP_TS29329_a30.ddf
index bc500d579db88fac2312d66f55693e5b309ebf03..ca9dce14e90e3dd6ee60e1664397787021e803c3 100644
--- a/src/ShInterface_3GPP_TS29329_a30.ddf
+++ b/src/ShInterface_3GPP_TS29329_a30.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/ShInterface_3GPP_TS29329_a50.ddf b/src/ShInterface_3GPP_TS29329_a50.ddf
index c7b428c9e61836885f28c49542708cd3b6edffaf..90cfb6dfd7760ae68a361f419a098fe298d29234 100644
--- a/src/ShInterface_3GPP_TS29329_a50.ddf
+++ b/src/ShInterface_3GPP_TS29329_a50.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/SyInterface_3GPP_TS29219_b30.ddf b/src/SyInterface_3GPP_TS29219_b30.ddf
index 026aceba7dc4ebf0e52a566add6228910da8f9c1..476ea9b5eb6365822e06039b8f2dac8aee801529 100644
--- a/src/SyInterface_3GPP_TS29219_b30.ddf
+++ b/src/SyInterface_3GPP_TS29219_b30.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/TCOM_Specific_AVPs.ddf b/src/TCOM_Specific_AVPs.ddf
index ece8125132eb781037616df2b72ebfcffae8472e..a2b349d20923200cdcb563b9b2f59258095188e1 100644
--- a/src/TCOM_Specific_AVPs.ddf
+++ b/src/TCOM_Specific_AVPs.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Verizon_Specific_AVPs.ddf b/src/Verizon_Specific_AVPs.ddf
index a48b7aea3ef5a7a3af68155f4dd4e2c2ed2d9d01..a3180ce24e731baf709f13561d9c2a4c2e695b38 100644
--- a/src/Verizon_Specific_AVPs.ddf
+++ b/src/Verizon_Specific_AVPs.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Vimpelcom_Specific.ddf b/src/Vimpelcom_Specific.ddf
index 4a3e6ced1bf1f9683a90f027c833d770e6c50f22..30bf358ef9456fc4e72c46c2f1c63a6d2abc50b4 100644
--- a/src/Vimpelcom_Specific.ddf
+++ b/src/Vimpelcom_Specific.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/Vodafone_Specific.ddf b/src/Vodafone_Specific.ddf
index d717cde626c30a4ad216f7dfc9524a091a7708d5..94cde6ef7253a8cd2d5ce6b8f3881568c31f44dc 100644
--- a/src/Vodafone_Specific.ddf
+++ b/src/Vodafone_Specific.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/WgInterface_3GPP_TS29234_910.ddf b/src/WgInterface_3GPP_TS29234_910.ddf
index 2e2fa17f222186eb503bda0860d0d10762ff9b60..03907c9576dcd0792d95afef1289c8eac3c2303d 100644
--- a/src/WgInterface_3GPP_TS29234_910.ddf
+++ b/src/WgInterface_3GPP_TS29234_910.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/a2Interface_ETSI_ES183059_1_211.ddf b/src/a2Interface_ETSI_ES183059_1_211.ddf
index 40ae1fb993ffbd946e35ecefabce2cb700b4d0ea..644751acaff02e3fd3edd1202e2b747f93a22615 100644
--- a/src/a2Interface_ETSI_ES183059_1_211.ddf
+++ b/src/a2Interface_ETSI_ES183059_1_211.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/a4Interface_ETSI_ES183066_211.ddf b/src/a4Interface_ETSI_ES183066_211.ddf
index e84666244785e53c3b9f443628e564e3f6a5e5db..2a272b712d9b8a519c4e45ccb86227690d57ae9e 100644
--- a/src/a4Interface_ETSI_ES183066_211.ddf
+++ b/src/a4Interface_ETSI_ES183066_211.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/e2Interface_ETSI_ES283035_121.ddf b/src/e2Interface_ETSI_ES283035_121.ddf
index ec522950d82cc388b35a4a7a20815cfe8915ee1e..2b41c35df9e1627c063518ea03679f986417b92a 100644
--- a/src/e2Interface_ETSI_ES283035_121.ddf
+++ b/src/e2Interface_ETSI_ES283035_121.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation
diff --git a/src/e4Interface_ETSI_ES283034_220.ddf b/src/e4Interface_ETSI_ES283034_220.ddf
index e3e138f70c039cd20f1edd0b96815498bae57d5d..8691869ac8d86a3c814d693a6825c9ccbb807b05 100644
--- a/src/e4Interface_ETSI_ES283034_220.ddf
+++ b/src/e4Interface_ETSI_ES283034_220.ddf
@@ -1,9 +1,9 @@
 /******************************************************************************
 * Copyright (c) 2004, 2014  Ericsson AB
 * All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
+* are made available under the terms of the Eclipse Public License v2.0
 * which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
 *   Roland Gecse - initial implementation and initial documentation