License upgrade to EPL 2.0

Signed-off-by: balaskoa <jeno.balasko@ericsson.com>
diff --git a/demo/Base/EPTF_Base_all.cfg b/demo/Base/EPTF_Base_all.cfg
index bfd6efb..6d40883 100644
--- a/demo/Base/EPTF_Base_all.cfg
+++ b/demo/Base/EPTF_Base_all.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 LogFile := "%e.%h-%r-%t.%s"
diff --git a/demo/Base/EPTF_Base_all.prj b/demo/Base/EPTF_Base_all.prj
index c241958..7afb5ad 100644
--- a/demo/Base/EPTF_Base_all.prj
+++ b/demo/Base/EPTF_Base_all.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Base/EPTF_Base_all.ttcn b/demo/Base/EPTF_Base_all.ttcn
index bad02e8..e0bad84 100644
--- a/demo/Base/EPTF_Base_all.ttcn
+++ b/demo/Base/EPTF_Base_all.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 module EPTF_Base_all {
diff --git a/demo/Base/EPTF_Base_test.cfg b/demo/Base/EPTF_Base_test.cfg
index bfd6efb..6d40883 100644
--- a/demo/Base/EPTF_Base_test.cfg
+++ b/demo/Base/EPTF_Base_test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 LogFile := "%e.%h-%r-%t.%s"
diff --git a/demo/Base/EPTF_Base_test.prj b/demo/Base/EPTF_Base_test.prj
index 9a8af19..a2bc53e 100644
--- a/demo/Base/EPTF_Base_test.prj
+++ b/demo/Base/EPTF_Base_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Base/EPTF_Base_test.ttcn b/demo/Base/EPTF_Base_test.ttcn
index 7fdd51f..b522bcc 100644
--- a/demo/Base/EPTF_Base_test.ttcn
+++ b/demo/Base/EPTF_Base_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 module EPTF_Base_test {
diff --git a/demo/CentralScheduling/Common/Common_Definitions.ttcn b/demo/CentralScheduling/Common/Common_Definitions.ttcn
index e6e5771..1c5a1fc 100644
--- a/demo/CentralScheduling/Common/Common_Definitions.ttcn
+++ b/demo/CentralScheduling/Common/Common_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 // Module: Common_Definitions
diff --git a/demo/CentralScheduling/EPTF_CS_demo.cfg b/demo/CentralScheduling/EPTF_CS_demo.cfg
index b9b25e7..d69856e 100644
--- a/demo/CentralScheduling/EPTF_CS_demo.cfg
+++ b/demo/CentralScheduling/EPTF_CS_demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 //TCPPort := 9999
diff --git a/demo/CentralScheduling/EPTF_CS_demo.prj b/demo/CentralScheduling/EPTF_CS_demo.prj
index cfcdb5a..be7bcb1 100644
--- a/demo/CentralScheduling/EPTF_CS_demo.prj
+++ b/demo/CentralScheduling/EPTF_CS_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/CentralScheduling/LoadRegulator/LoadRegulator_Definitions.ttcn b/demo/CentralScheduling/LoadRegulator/LoadRegulator_Definitions.ttcn
index de16880..b8b8203 100644
--- a/demo/CentralScheduling/LoadRegulator/LoadRegulator_Definitions.ttcn
+++ b/demo/CentralScheduling/LoadRegulator/LoadRegulator_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/LoadRegulator/LoadRegulator_Functions.ttcn b/demo/CentralScheduling/LoadRegulator/LoadRegulator_Functions.ttcn
index 75a2ce1..5997e12 100644
--- a/demo/CentralScheduling/LoadRegulator/LoadRegulator_Functions.ttcn
+++ b/demo/CentralScheduling/LoadRegulator/LoadRegulator_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/Main/MainModule.ttcn b/demo/CentralScheduling/Main/MainModule.ttcn
index 284c9cd..096abb3 100644
--- a/demo/CentralScheduling/Main/MainModule.ttcn
+++ b/demo/CentralScheduling/Main/MainModule.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolA/A_defs.ttcn b/demo/CentralScheduling/protocolA/A_defs.ttcn
index 40e9003..fa51c62 100644
--- a/demo/CentralScheduling/protocolA/A_defs.ttcn
+++ b/demo/CentralScheduling/protocolA/A_defs.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolA/CS_A_Definitions.ttcn b/demo/CentralScheduling/protocolA/CS_A_Definitions.ttcn
index 233f417..56ed8e7 100644
--- a/demo/CentralScheduling/protocolA/CS_A_Definitions.ttcn
+++ b/demo/CentralScheduling/protocolA/CS_A_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolA/CS_A_Functions.ttcn b/demo/CentralScheduling/protocolA/CS_A_Functions.ttcn
index b20d52e..3590fcd 100644
--- a/demo/CentralScheduling/protocolA/CS_A_Functions.ttcn
+++ b/demo/CentralScheduling/protocolA/CS_A_Functions.ttcn
@@ -9,9 +9,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolA/LGen_A_Functions.ttcn b/demo/CentralScheduling/protocolA/LGen_A_Functions.ttcn
index 6130d2a..dc53eb9 100644
--- a/demo/CentralScheduling/protocolA/LGen_A_Functions.ttcn
+++ b/demo/CentralScheduling/protocolA/LGen_A_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolB/B_defs.ttcn b/demo/CentralScheduling/protocolB/B_defs.ttcn
index 3c9f5b6..4785b4f 100644
--- a/demo/CentralScheduling/protocolB/B_defs.ttcn
+++ b/demo/CentralScheduling/protocolB/B_defs.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolB/CS_B_Definitions.ttcn b/demo/CentralScheduling/protocolB/CS_B_Definitions.ttcn
index 64dc6c5..eb9177b 100644
--- a/demo/CentralScheduling/protocolB/CS_B_Definitions.ttcn
+++ b/demo/CentralScheduling/protocolB/CS_B_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolB/CS_B_Functions.ttcn b/demo/CentralScheduling/protocolB/CS_B_Functions.ttcn
index 57e3fea..2895afc 100644
--- a/demo/CentralScheduling/protocolB/CS_B_Functions.ttcn
+++ b/demo/CentralScheduling/protocolB/CS_B_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CentralScheduling/protocolB/LGen_B_Functions.ttcn b/demo/CentralScheduling/protocolB/LGen_B_Functions.ttcn
index 676d927..15b45ad 100644
--- a/demo/CentralScheduling/protocolB/LGen_B_Functions.ttcn
+++ b/demo/CentralScheduling/protocolB/LGen_B_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.prj b/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.prj
index 229ec59..74e3738 100644
--- a/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.prj
+++ b/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.ttcn b/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.ttcn
index 31130df..833f6a8 100644
--- a/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.ttcn
+++ b/demo/CommandLineInterface/EPTF_CLL_CLI_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/CommandLineInterface/Makefile_patch.sh b/demo/CommandLineInterface/Makefile_patch.sh
index 87d8999..da252e6 100755
--- a/demo/CommandLineInterface/Makefile_patch.sh
+++ b/demo/CommandLineInterface/Makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e '
 s/SOLARIS8_LIBS = -lsocket -lnsl/SOLARIS8_LIBS = -lsocket -lnsl -lresolv/g
diff --git a/demo/CommandLineInterface/cli.cfg b/demo/CommandLineInterface/cli.cfg
index 9374e87..e460fba 100644
--- a/demo/CommandLineInterface/cli.cfg
+++ b/demo/CommandLineInterface/cli.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [DEFINE]
 
diff --git a/demo/Common/RndValues_Demo.cfg b/demo/Common/RndValues_Demo.cfg
index f9dc1e9..9785b5b 100644
--- a/demo/Common/RndValues_Demo.cfg
+++ b/demo/Common/RndValues_Demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 #FileMask := LOG_ALL 
diff --git a/demo/Common/RndValues_Demo.prj b/demo/Common/RndValues_Demo.prj
index af239be..b32bb56 100644
--- a/demo/Common/RndValues_Demo.prj
+++ b/demo/Common/RndValues_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Common/RndValues_Demo.ttcn b/demo/Common/RndValues_Demo.ttcn
index 82cd927..a27b5e0 100644
--- a/demo/Common/RndValues_Demo.ttcn
+++ b/demo/Common/RndValues_Demo.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/DataSource/DataSource_Demo.grp b/demo/DataSource/DataSource_Demo.grp
index dbe4f34..f75b951 100644
--- a/demo/DataSource/DataSource_Demo.grp
+++ b/demo/DataSource/DataSource_Demo.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/DataSource/EPTF_CLL_DataSource_Demo.ttcn b/demo/DataSource/EPTF_CLL_DataSource_Demo.ttcn
index 207fa5c..de60e71 100644
--- a/demo/DataSource/EPTF_CLL_DataSource_Demo.ttcn
+++ b/demo/DataSource/EPTF_CLL_DataSource_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/DataSource/EPTF_DataSource_Demo.cfg b/demo/DataSource/EPTF_DataSource_Demo.cfg
index a10dc01..c84085a 100644
--- a/demo/DataSource/EPTF_DataSource_Demo.cfg
+++ b/demo/DataSource/EPTF_DataSource_Demo.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 //                                                                           //

 ///////////////////////////////////////////////////////////////////////////////

 [MODULE_PARAMETERS]

diff --git a/demo/DataSource/EPTF_DataSource_Demo.prj b/demo/DataSource/EPTF_DataSource_Demo.prj
index 275740e..2573611 100644
--- a/demo/DataSource/EPTF_DataSource_Demo.prj
+++ b/demo/DataSource/EPTF_DataSource_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/DsRestAPI/PythonAPI/exitDsRestAPI.py b/demo/DsRestAPI/PythonAPI/exitDsRestAPI.py
index b3c7bcc..b261ff9 100755
--- a/demo/DsRestAPI/PythonAPI/exitDsRestAPI.py
+++ b/demo/DsRestAPI/PythonAPI/exitDsRestAPI.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import json
diff --git a/demo/ExecCtrl/AppLib_A_Definitions.ttcn b/demo/ExecCtrl/AppLib_A_Definitions.ttcn
index 9f90de5..665a57b 100644
--- a/demo/ExecCtrl/AppLib_A_Definitions.ttcn
+++ b/demo/ExecCtrl/AppLib_A_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ExecCtrl/AppLib_A_Functions.ttcn b/demo/ExecCtrl/AppLib_A_Functions.ttcn
index 9491b7b..e1acad0 100644
--- a/demo/ExecCtrl/AppLib_A_Functions.ttcn
+++ b/demo/ExecCtrl/AppLib_A_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ExecCtrl/ExecControlUIHandler_Demo.grp b/demo/ExecCtrl/ExecControlUIHandler_Demo.grp
index 5e018f4..7c11350 100644
--- a/demo/ExecCtrl/ExecControlUIHandler_Demo.grp
+++ b/demo/ExecCtrl/ExecControlUIHandler_Demo.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.cfg b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.cfg
index aa6a1d5..ef42ef8 100644
--- a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.cfg
+++ b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
index efd1bf0..0db2853 100644
--- a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
+++ b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.ttcn b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.ttcn
index 53160d1..18b510b 100644
--- a/demo/ExecCtrl/ExecCtrlLGenPool_Demo.ttcn
+++ b/demo/ExecCtrl/ExecCtrlLGenPool_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ExecCtrl/ExecCtrlUIHandler_Demo.ttcn b/demo/ExecCtrl/ExecCtrlUIHandler_Demo.ttcn
index 24704f8..05cb5a6 100644
--- a/demo/ExecCtrl/ExecCtrlUIHandler_Demo.ttcn
+++ b/demo/ExecCtrl/ExecCtrlUIHandler_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj b/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj
index 01ca474..1d07d6b 100644
--- a/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj
+++ b/demo/ExecCtrl/ExecCtrlUIHandler_demo.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/ExecCtrl/ExecCtrl_Demo.ttcn b/demo/ExecCtrl/ExecCtrl_Demo.ttcn
index aafdd48..55aa0f8 100644
--- a/demo/ExecCtrl/ExecCtrl_Demo.ttcn
+++ b/demo/ExecCtrl/ExecCtrl_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ExecCtrl/ExecCtrl_demo.prj b/demo/ExecCtrl/ExecCtrl_demo.prj
index 8541507..a36d723 100644
--- a/demo/ExecCtrl/ExecCtrl_demo.prj
+++ b/demo/ExecCtrl/ExecCtrl_demo.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/ExecCtrl/LoadRegUIHandler.grp b/demo/ExecCtrl/LoadRegUIHandler.grp
index 2642b42..fe50391 100644
--- a/demo/ExecCtrl/LoadRegUIHandler.grp
+++ b/demo/ExecCtrl/LoadRegUIHandler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/ExecCtrl/execctrld.cfg b/demo/ExecCtrl/execctrld.cfg
index aa0bd32..35e829d 100644
--- a/demo/ExecCtrl/execctrld.cfg
+++ b/demo/ExecCtrl/execctrld.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.cfg b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.cfg
index b948ed0..7115db7 100644
--- a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.cfg
+++ b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [TESTPORT_PARAMETERS]
 
diff --git a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.prj b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.prj
index fcc0688..35f2c4c 100644
--- a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.prj
+++ b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.tpd b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.tpd
index 7176fb1..a71f06f 100644
--- a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.tpd
+++ b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.ttcn b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.ttcn
index 4140b42..a54192d 100644
--- a/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.ttcn
+++ b/demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/GUIViewer/GUIViewer_Demo.cfg b/demo/GUIViewer/GUIViewer_Demo.cfg
index e3d53cb..d950274 100644
--- a/demo/GUIViewer/GUIViewer_Demo.cfg
+++ b/demo/GUIViewer/GUIViewer_Demo.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/demo/GUIViewer/GUIViewer_Demo.prj b/demo/GUIViewer/GUIViewer_Demo.prj
index 5e5b761..f8489f5 100644
--- a/demo/GUIViewer/GUIViewer_Demo.prj
+++ b/demo/GUIViewer/GUIViewer_Demo.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/HashMap/HashMap.cfg b/demo/HashMap/HashMap.cfg
index 3119af4..865ead3 100644
--- a/demo/HashMap/HashMap.cfg
+++ b/demo/HashMap/HashMap.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/demo/HashMap/HashMap.prj b/demo/HashMap/HashMap.prj
index 02a4b3e..a9992e4 100644
--- a/demo/HashMap/HashMap.prj
+++ b/demo/HashMap/HashMap.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/HashMap/HashMap_demo.grp b/demo/HashMap/HashMap_demo.grp
index ba96dd2..2f3ff47 100644
--- a/demo/HashMap/HashMap_demo.grp
+++ b/demo/HashMap/HashMap_demo.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/HashMap/HashMap_demo.ttcn b/demo/HashMap/HashMap_demo.ttcn
index 307454f..d0a1f63 100644
--- a/demo/HashMap/HashMap_demo.ttcn
+++ b/demo/HashMap/HashMap_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/HostAdmin/EPTF_HostAdmin_demo.cfg b/demo/HostAdmin/EPTF_HostAdmin_demo.cfg
index d0023e8..d3b1563 100644
--- a/demo/HostAdmin/EPTF_HostAdmin_demo.cfg
+++ b/demo/HostAdmin/EPTF_HostAdmin_demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/demo/HostAdmin/EPTF_HostAdmin_demo.prj b/demo/HostAdmin/EPTF_HostAdmin_demo.prj
index 52f8f39..7cd3c6e 100644
--- a/demo/HostAdmin/EPTF_HostAdmin_demo.prj
+++ b/demo/HostAdmin/EPTF_HostAdmin_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/HostAdmin/EPTF_HostAdmin_demo.ttcn b/demo/HostAdmin/EPTF_HostAdmin_demo.ttcn
index 3adb8e6..92efbeb 100644
--- a/demo/HostAdmin/EPTF_HostAdmin_demo.ttcn
+++ b/demo/HostAdmin/EPTF_HostAdmin_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/HostAdmin/LOADMEASasp.grp b/demo/HostAdmin/LOADMEASasp.grp
index 467208a..0cf3685 100644
--- a/demo/HostAdmin/LOADMEASasp.grp
+++ b/demo/HostAdmin/LOADMEASasp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/HostAdmin/PIPEasp.grp b/demo/HostAdmin/PIPEasp.grp
index 61c91b4..7ddb585 100644
--- a/demo/HostAdmin/PIPEasp.grp
+++ b/demo/HostAdmin/PIPEasp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/HostAdmin/gui.xml b/demo/HostAdmin/gui.xml
index 43ff67c..c6a6c54 100644
--- a/demo/HostAdmin/gui.xml
+++ b/demo/HostAdmin/gui.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/demo/HostAdmin/makefile_patch.sh b/demo/HostAdmin/makefile_patch.sh
index 1d79a78..00806d1 100755
--- a/demo/HostAdmin/makefile_patch.sh
+++ b/demo/HostAdmin/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/demo/ILog/EPTF_ILog_Applib_Definitions.ttcn b/demo/ILog/EPTF_ILog_Applib_Definitions.ttcn
index dd318ab..3a4c691 100644
--- a/demo/ILog/EPTF_ILog_Applib_Definitions.ttcn
+++ b/demo/ILog/EPTF_ILog_Applib_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ILog/EPTF_ILog_Applib_Functions.ttcn b/demo/ILog/EPTF_ILog_Applib_Functions.ttcn
index 4d52ac2..975d7e1 100644
--- a/demo/ILog/EPTF_ILog_Applib_Functions.ttcn
+++ b/demo/ILog/EPTF_ILog_Applib_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ILog/EPTF_ILog_Application_Definitions.ttcn b/demo/ILog/EPTF_ILog_Application_Definitions.ttcn
index a575dad..2332b95 100755
--- a/demo/ILog/EPTF_ILog_Application_Definitions.ttcn
+++ b/demo/ILog/EPTF_ILog_Application_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ILog/EPTF_ILog_Application_Functions.ttcn b/demo/ILog/EPTF_ILog_Application_Functions.ttcn
index 1eab5ca..bc99f68 100755
--- a/demo/ILog/EPTF_ILog_Application_Functions.ttcn
+++ b/demo/ILog/EPTF_ILog_Application_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ILog/EPTF_ILog_Transport_Definitions.ttcn b/demo/ILog/EPTF_ILog_Transport_Definitions.ttcn
index 10a9728..0653da3 100644
--- a/demo/ILog/EPTF_ILog_Transport_Definitions.ttcn
+++ b/demo/ILog/EPTF_ILog_Transport_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ILog/EPTF_ILog_Transport_Functions.ttcn b/demo/ILog/EPTF_ILog_Transport_Functions.ttcn
index 7a08a8a..a69cc76 100644
--- a/demo/ILog/EPTF_ILog_Transport_Functions.ttcn
+++ b/demo/ILog/EPTF_ILog_Transport_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/ILog/EPTF_ILog_demo.cfg b/demo/ILog/EPTF_ILog_demo.cfg
index 3cdbe5c..73e673f 100644
--- a/demo/ILog/EPTF_ILog_demo.cfg
+++ b/demo/ILog/EPTF_ILog_demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 [LOGGING]
diff --git a/demo/ILog/EPTF_ILog_demo.prj b/demo/ILog/EPTF_ILog_demo.prj
index 94971df..acc34d6 100644
--- a/demo/ILog/EPTF_ILog_demo.prj
+++ b/demo/ILog/EPTF_ILog_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/ILog/EPTF_ILog_demo.tpd b/demo/ILog/EPTF_ILog_demo.tpd
index f9d7f95..b3e0514 100644
--- a/demo/ILog/EPTF_ILog_demo.tpd
+++ b/demo/ILog/EPTF_ILog_demo.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/demo/ILog/EPTF_ILog_demo.ttcn b/demo/ILog/EPTF_ILog_demo.ttcn
index 656207f..0bd7881 100644
--- a/demo/ILog/EPTF_ILog_demo.ttcn
+++ b/demo/ILog/EPTF_ILog_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo.cfg b/demo/LGenBase/EPTF_LGenBaseDemo.cfg
index 23b3975..5800c13 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo.cfg
+++ b/demo/LGenBase/EPTF_LGenBaseDemo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 //tsp_EPTF_LGenBase_debugVars := true
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo.prj b/demo/LGenBase/EPTF_LGenBaseDemo.prj
index d0a65de..031d9e7 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo.prj
+++ b/demo/LGenBase/EPTF_LGenBaseDemo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_CallerDefinitions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_CallerDefinitions.ttcn
index 1817374..4bf35cd 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_CallerDefinitions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_CallerDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_CallerFunctions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_CallerFunctions.ttcn
index dd89a24..f7a8fa4 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_CallerFunctions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_CallerFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_Definitions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_Definitions.ttcn
index d45ff54..54f0953 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_Definitions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_Functions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_Functions.ttcn
index 3e83719..6007aa9 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_Functions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_ResponderDefinitions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_ResponderDefinitions.ttcn
index 2280bbb..5bb4eda 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_ResponderDefinitions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_ResponderDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_ResponderFunctions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_ResponderFunctions.ttcn
index 13be065..eb76589 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_ResponderFunctions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_ResponderFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmDefinitions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmDefinitions.ttcn
index 3342db2..0531965 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmDefinitions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmFunctions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmFunctions.ttcn
index 157a499..a91a151 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmFunctions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_TemplateFunctions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_TemplateFunctions.ttcn
index 15ada86..43f0c16 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_TemplateFunctions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_TemplateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_TransportDefinitions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_TransportDefinitions.ttcn
index f1e6a8b..fa95f0e 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_TransportDefinitions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_TransportDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_TransportFunctions.ttcn b/demo/LGenBase/EPTF_LGenBaseDemo_TransportFunctions.ttcn
index e365449..75d0dc3 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_TransportFunctions.ttcn
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_TransportFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_msgReRegisterTemplate.txt b/demo/LGenBase/EPTF_LGenBaseDemo_msgReRegisterTemplate.txt
index 81f60c9..46c79cb 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_msgReRegisterTemplate.txt
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_msgReRegisterTemplate.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 LGenBase Demo ReRegisterMsg
 From: $(phonePrefix)$(fromNr)
diff --git a/demo/LGenBase/EPTF_LGenBaseDemo_msgRegisterTemplate.txt b/demo/LGenBase/EPTF_LGenBaseDemo_msgRegisterTemplate.txt
index 167f2ba..0c81301 100644
--- a/demo/LGenBase/EPTF_LGenBaseDemo_msgRegisterTemplate.txt
+++ b/demo/LGenBase/EPTF_LGenBaseDemo_msgRegisterTemplate.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 LGenBase Demo RegisterMsg
 From: $(phonePrefix)$(fromNr)
diff --git a/demo/LGenBase/Readme.txt b/demo/LGenBase/Readme.txt
index ae45855..36059b2 100644
--- a/demo/LGenBase/Readme.txt
+++ b/demo/LGenBase/Readme.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 The purpose of this demo is to give a basic view of the use of the LGenBase
 feature of the TitanSim Core Load Library.
diff --git a/demo/LoadRegulator/EPTF_LoadRegulator_demo.cfg b/demo/LoadRegulator/EPTF_LoadRegulator_demo.cfg
index 5ca1c6d..b67ac9e 100644
--- a/demo/LoadRegulator/EPTF_LoadRegulator_demo.cfg
+++ b/demo/LoadRegulator/EPTF_LoadRegulator_demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 #TCPPort := 9999
diff --git a/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj b/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
index 3573cb3..8b6b523 100644
--- a/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
+++ b/demo/LoadRegulator/EPTF_LoadRegulator_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/LoadRegulator/EPTF_LoadRegulator_demo.ttcn b/demo/LoadRegulator/EPTF_LoadRegulator_demo.ttcn
index a83c13b..85c1956 100644
--- a/demo/LoadRegulator/EPTF_LoadRegulator_demo.ttcn
+++ b/demo/LoadRegulator/EPTF_LoadRegulator_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/Logging/EPTF_Logging_test.cfg b/demo/Logging/EPTF_Logging_test.cfg
index 74f81ae..bf8f60d 100644
--- a/demo/Logging/EPTF_Logging_test.cfg
+++ b/demo/Logging/EPTF_Logging_test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL
diff --git a/demo/Logging/EPTF_Logging_test.prj b/demo/Logging/EPTF_Logging_test.prj
index 6232052..d5b8468 100644
--- a/demo/Logging/EPTF_Logging_test.prj
+++ b/demo/Logging/EPTF_Logging_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Logging/EPTF_Logging_test.ttcn b/demo/Logging/EPTF_Logging_test.ttcn
index 0e63af1..db19e8d 100644
--- a/demo/Logging/EPTF_Logging_test.ttcn
+++ b/demo/Logging/EPTF_Logging_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Logging_test {
 
diff --git a/demo/Logging/LoggingUI.cfg b/demo/Logging/LoggingUI.cfg
index 62f9926..3052e24 100644
--- a/demo/Logging/LoggingUI.cfg
+++ b/demo/Logging/LoggingUI.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/demo/Logging/LoggingUI.prj b/demo/Logging/LoggingUI.prj
index a1f3fd0..519e997 100644
--- a/demo/Logging/LoggingUI.prj
+++ b/demo/Logging/LoggingUI.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Logging/LoggingUI_Demo.ttcn b/demo/Logging/LoggingUI_Demo.ttcn
index 25a5cef..1843d20 100644
--- a/demo/Logging/LoggingUI_Demo.ttcn
+++ b/demo/Logging/LoggingUI_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/Logging/Logging_Demo.grp b/demo/Logging/Logging_Demo.grp
index 5420017..4a043ef 100644
--- a/demo/Logging/Logging_Demo.grp
+++ b/demo/Logging/Logging_Demo.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Logging/TCCUsefulFunctions.grp b/demo/Logging/TCCUsefulFunctions.grp
index 55c98d4..4168fe3 100644
--- a/demo/Logging/TCCUsefulFunctions.grp
+++ b/demo/Logging/TCCUsefulFunctions.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Logging/TELNETasp.grp b/demo/Logging/TELNETasp.grp
index e4dfb4d..497eebf 100644
--- a/demo/Logging/TELNETasp.grp
+++ b/demo/Logging/TELNETasp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Logging/XTDPasp.grp b/demo/Logging/XTDPasp.grp
index a6ced02..35d83d4 100644
--- a/demo/Logging/XTDPasp.grp
+++ b/demo/Logging/XTDPasp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/NameService/EPTF_NameService_test.prj b/demo/NameService/EPTF_NameService_test.prj
index 8372597..6e64a84 100644
--- a/demo/NameService/EPTF_NameService_test.prj
+++ b/demo/NameService/EPTF_NameService_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/NameService/EPTF_NameService_test.ttcn b/demo/NameService/EPTF_NameService_test.ttcn
index fe98f65..5a66d9d 100644
--- a/demo/NameService/EPTF_NameService_test.ttcn
+++ b/demo/NameService/EPTF_NameService_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 module EPTF_NameService_test {
diff --git a/demo/PTCDeployment/EPTF_PTCDeployment_test.prj b/demo/PTCDeployment/EPTF_PTCDeployment_test.prj
index a81c502..fe53e5e 100644
--- a/demo/PTCDeployment/EPTF_PTCDeployment_test.prj
+++ b/demo/PTCDeployment/EPTF_PTCDeployment_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/PTCDeployment/EPTF_PTCDeployment_test.ttcn b/demo/PTCDeployment/EPTF_PTCDeployment_test.ttcn
index 2e63e64..8610b6d 100644
--- a/demo/PTCDeployment/EPTF_PTCDeployment_test.ttcn
+++ b/demo/PTCDeployment/EPTF_PTCDeployment_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_PTCDeployment_test{
   
diff --git a/demo/RandomNArray/EPTF_RNA.cfg b/demo/RandomNArray/EPTF_RNA.cfg
index 84eb50e..c9a1209 100644
--- a/demo/RandomNArray/EPTF_RNA.cfg
+++ b/demo/RandomNArray/EPTF_RNA.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/demo/RandomNArray/EPTF_RNA_Demo.prj b/demo/RandomNArray/EPTF_RNA_Demo.prj
index 14a5168..bc333c5 100644
--- a/demo/RandomNArray/EPTF_RNA_Demo.prj
+++ b/demo/RandomNArray/EPTF_RNA_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/RandomNArray/EPTF_RNA_Demo.ttcn b/demo/RandomNArray/EPTF_RNA_Demo.ttcn
index a6eeb7b..fbd35d1 100644
--- a/demo/RandomNArray/EPTF_RNA_Demo.ttcn
+++ b/demo/RandomNArray/EPTF_RNA_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/RedBlackTree/EPTF_RedBlackTree_demo.cfg b/demo/RedBlackTree/EPTF_RedBlackTree_demo.cfg
index 2d38f17..1a31379 100644
--- a/demo/RedBlackTree/EPTF_RedBlackTree_demo.cfg
+++ b/demo/RedBlackTree/EPTF_RedBlackTree_demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [TESTPORT_PARAMETERS]
 
diff --git a/demo/RedBlackTree/EPTF_RedBlackTree_demo.prj b/demo/RedBlackTree/EPTF_RedBlackTree_demo.prj
index 1f5186b..02cb216 100644
--- a/demo/RedBlackTree/EPTF_RedBlackTree_demo.prj
+++ b/demo/RedBlackTree/EPTF_RedBlackTree_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/RedBlackTree/EPTF_RedBlackTree_demo.ttcn b/demo/RedBlackTree/EPTF_RedBlackTree_demo.ttcn
index e666f00..3c43f3a 100644
--- a/demo/RedBlackTree/EPTF_RedBlackTree_demo.ttcn
+++ b/demo/RedBlackTree/EPTF_RedBlackTree_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/RendezVous/EPTF_Rendezvous.prj b/demo/RendezVous/EPTF_Rendezvous.prj
index 4b4fef6..fc9885a 100644
--- a/demo/RendezVous/EPTF_Rendezvous.prj
+++ b/demo/RendezVous/EPTF_Rendezvous.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/RendezVous/EPTF_Rendezvous_Demo.ttcn b/demo/RendezVous/EPTF_Rendezvous_Demo.ttcn
index 8be8262..aab2592 100644
--- a/demo/RendezVous/EPTF_Rendezvous_Demo.ttcn
+++ b/demo/RendezVous/EPTF_Rendezvous_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/RendezVous/Rendezvous.cfg b/demo/RendezVous/Rendezvous.cfg
index cf64c6d..09beb14 100644
--- a/demo/RendezVous/Rendezvous.cfg
+++ b/demo/RendezVous/Rendezvous.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/demo/RingBuffer/MyMessageTypeRingBuffer_Functions.ttcnpp b/demo/RingBuffer/MyMessageTypeRingBuffer_Functions.ttcnpp
index 3310b54..61ffd71 100644
--- a/demo/RingBuffer/MyMessageTypeRingBuffer_Functions.ttcnpp
+++ b/demo/RingBuffer/MyMessageTypeRingBuffer_Functions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/RingBuffer/MyMessageTypeRingBuffer_demo.ttcn b/demo/RingBuffer/MyMessageTypeRingBuffer_demo.ttcn
index 41f4714..5c1cd59 100644
--- a/demo/RingBuffer/MyMessageTypeRingBuffer_demo.ttcn
+++ b/demo/RingBuffer/MyMessageTypeRingBuffer_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/RingBuffer/RingBuffer_Demo.prj b/demo/RingBuffer/RingBuffer_Demo.prj
index 1786762..470e78d 100644
--- a/demo/RingBuffer/RingBuffer_Demo.prj
+++ b/demo/RingBuffer/RingBuffer_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Scheduler/EPTF_Scheduler_test.prj b/demo/Scheduler/EPTF_Scheduler_test.prj
index 098a194..e8e90c9 100644
--- a/demo/Scheduler/EPTF_Scheduler_test.prj
+++ b/demo/Scheduler/EPTF_Scheduler_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Scheduler/EPTF_Scheduler_test.ttcn b/demo/Scheduler/EPTF_Scheduler_test.ttcn
index 96984fd..940909d 100644
--- a/demo/Scheduler/EPTF_Scheduler_test.ttcn
+++ b/demo/Scheduler/EPTF_Scheduler_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Scheduler_test {
 
diff --git a/demo/Semaphore/EPTF_Semaphore_test.prj b/demo/Semaphore/EPTF_Semaphore_test.prj
index 1bc291e..45aa313 100644
--- a/demo/Semaphore/EPTF_Semaphore_test.prj
+++ b/demo/Semaphore/EPTF_Semaphore_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Semaphore/EPTF_Semaphore_test.ttcn b/demo/Semaphore/EPTF_Semaphore_test.ttcn
index b6d7eb7..1b2d53d 100644
--- a/demo/Semaphore/EPTF_Semaphore_test.ttcn
+++ b/demo/Semaphore/EPTF_Semaphore_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Semaphore_test {
 
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/SimpleHello_Demo.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/SimpleHello_Demo.ttcn
index 868864a..e60c33a 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/SimpleHello_Demo.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/SimpleHello_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj
index 58d42ea..ae8f5de 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/Simple_Hello.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/makefile_patch.sh b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/makefile_patch.sh
index f635450..56e0a8b 100755
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/makefile_patch.sh
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/request_templ.txt b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/request_templ.txt
index 954493b..84a8380 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/request_templ.txt
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/request_templ.txt
@@ -2,8 +2,8 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 00000000000000000000000000000000000000000000000007000000$(senderId)$(msg)
\ No newline at end of file
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/sh.cfg b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/sh.cfg
index d8b2fe7..19c560e 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/sh.cfg
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/demo/sh.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Definitions.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Definitions.ttcn
index a46d702..b86148b 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Definitions.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Functions.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Functions.ttcn
index 2cd0687..950024a 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Functions.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/LoadGen/EPTF_SimpleHello_LGen_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Definitions.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Definitions.ttcn
index a9e90e2..0d24f50 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Definitions.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Functions.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Functions.ttcn
index 3b732cb..80d100a 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Functions.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Logger/EPTF_SimpleHello_Logger_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Definitions.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Definitions.ttcn
index 5638f12..e225766 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Definitions.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Functions.ttcn b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Functions.ttcn
index f723c0b..e5ceb7a 100644
--- a/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Functions.ttcn
+++ b/demo/SimpleHello/EPTF_Applib_SimpleHello/src/Transport/EPTF_SimpleHello_Transport_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/SimpleHello/Readme b/demo/SimpleHello/Readme
index a2a3734..2caf5da 100644
--- a/demo/SimpleHello/Readme
+++ b/demo/SimpleHello/Readme
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 This is a Demo Application to present the basic structure of the TITAnSim R2.
diff --git a/demo/SimpleHello/SimpleHello_ProtocolModule/src/EPTF_SimpleHello_Definitions.ttcn b/demo/SimpleHello/SimpleHello_ProtocolModule/src/EPTF_SimpleHello_Definitions.ttcn
index 627a1b9..d923310 100644
--- a/demo/SimpleHello/SimpleHello_ProtocolModule/src/EPTF_SimpleHello_Definitions.ttcn
+++ b/demo/SimpleHello/SimpleHello_ProtocolModule/src/EPTF_SimpleHello_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/demo/StatCapture/EPTF_StatCaptureControl_demo.ttcn b/demo/StatCapture/EPTF_StatCaptureControl_demo.ttcn
index 21f6610..afca1c8 100644
--- a/demo/StatCapture/EPTF_StatCaptureControl_demo.ttcn
+++ b/demo/StatCapture/EPTF_StatCaptureControl_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/StatCapture/EPTF_StatCapture_demo.ttcn b/demo/StatCapture/EPTF_StatCapture_demo.ttcn
index a7c91e7..651a352 100644
--- a/demo/StatCapture/EPTF_StatCapture_demo.ttcn
+++ b/demo/StatCapture/EPTF_StatCapture_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/StatCapture/StatCaptureTest.prj b/demo/StatCapture/StatCaptureTest.prj
index 3bd9e64..7c6b2ce 100644
--- a/demo/StatCapture/StatCaptureTest.prj
+++ b/demo/StatCapture/StatCaptureTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/StatCapture/main.cfg b/demo/StatCapture/main.cfg
index 8ff41fb..12a9e9e 100644
--- a/demo/StatCapture/main.cfg
+++ b/demo/StatCapture/main.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 LogFile := "%e.%h-%r-%t.%s"
diff --git a/demo/StatHandler/EPTF_StatHandler_Demo.cfg b/demo/StatHandler/EPTF_StatHandler_Demo.cfg
index 3d922fd..c7c9862 100644
--- a/demo/StatHandler/EPTF_StatHandler_Demo.cfg
+++ b/demo/StatHandler/EPTF_StatHandler_Demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_xtdp_listen_addr := "127.0.0.1"
diff --git a/demo/StatHandler/EPTF_StatHandler_Demo.prj b/demo/StatHandler/EPTF_StatHandler_Demo.prj
index ba43c12..587277e 100644
--- a/demo/StatHandler/EPTF_StatHandler_Demo.prj
+++ b/demo/StatHandler/EPTF_StatHandler_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/StatHandler/EPTF_StatHandler_Demo.ttcn b/demo/StatHandler/EPTF_StatHandler_Demo.ttcn
index 704ce5b..262daff 100644
--- a/demo/StatHandler/EPTF_StatHandler_Demo.ttcn
+++ b/demo/StatHandler/EPTF_StatHandler_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/StatManager/EPTF_StatManager_demo.prj b/demo/StatManager/EPTF_StatManager_demo.prj
index ec38a80..874563a 100644
--- a/demo/StatManager/EPTF_StatManager_demo.prj
+++ b/demo/StatManager/EPTF_StatManager_demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/StatManager/EPTF_StatManager_demo.ttcn b/demo/StatManager/EPTF_StatManager_demo.ttcn
index 4d02d5b..52ac99a 100644
--- a/demo/StatManager/EPTF_StatManager_demo.ttcn
+++ b/demo/StatManager/EPTF_StatManager_demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatManager_Test_Testcases {
 
diff --git a/demo/StatManager/main.cfg b/demo/StatManager/main.cfg
index 38d42af..4fe231f 100644
--- a/demo/StatManager/main.cfg
+++ b/demo/StatManager/main.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/demo/StatMeasure/EPTF_StatMeasure_test.prj b/demo/StatMeasure/EPTF_StatMeasure_test.prj
index fb02bde..f4692cc 100644
--- a/demo/StatMeasure/EPTF_StatMeasure_test.prj
+++ b/demo/StatMeasure/EPTF_StatMeasure_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/StatMeasure/EPTF_StatMeasure_test.ttcn b/demo/StatMeasure/EPTF_StatMeasure_test.ttcn
index 14ff4ab..84590ea 100644
--- a/demo/StatMeasure/EPTF_StatMeasure_test.ttcn
+++ b/demo/StatMeasure/EPTF_StatMeasure_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatMeasure_test {
 
diff --git a/demo/StatMeasure/UsefulFunctions.grp b/demo/StatMeasure/UsefulFunctions.grp
index 38f537d..08247d6 100644
--- a/demo/StatMeasure/UsefulFunctions.grp
+++ b/demo/StatMeasure/UsefulFunctions.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/StatReplay/README.TXT b/demo/StatReplay/README.TXT
index dc0124c..228f640 100644
--- a/demo/StatReplay/README.TXT
+++ b/demo/StatReplay/README.TXT
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 /////////////////////////////////////////////////////////////////////////////// 

 

 The demo directory is empty. The demo ttcn file is in the src directory (EPTF_CLL_StatReplay_Execution), because

diff --git a/demo/StatReplay/StatReplay_Demo.cfg b/demo/StatReplay/StatReplay_Demo.cfg
index ac67ca8..4f8d983 100644
--- a/demo/StatReplay/StatReplay_Demo.cfg
+++ b/demo/StatReplay/StatReplay_Demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 //LogFile := "%e.%h-%r-%t.%s"
diff --git a/demo/StatReplay/StatReplay_Demo.prj b/demo/StatReplay/StatReplay_Demo.prj
index aa8e62d..603380a 100644
--- a/demo/StatReplay/StatReplay_Demo.prj
+++ b/demo/StatReplay/StatReplay_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/StatReplay/testlog.txt b/demo/StatReplay/testlog.txt
index 6d9cef2..5e24543 100644
--- a/demo/StatReplay/testlog.txt
+++ b/demo/StatReplay/testlog.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 TimeStampBase: 2007-11-29-10:18:19.412000 0.295000

 CaptureGroup["group1"]

diff --git a/demo/TimeProfileEditor/TimeProfileEditor.cfg b/demo/TimeProfileEditor/TimeProfileEditor.cfg
index 6c70b55..eb344f9 100644
--- a/demo/TimeProfileEditor/TimeProfileEditor.cfg
+++ b/demo/TimeProfileEditor/TimeProfileEditor.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 #FileMask := LOG_NOTHING
diff --git a/demo/TimeProfileEditor/TimeProfileEditor.prj b/demo/TimeProfileEditor/TimeProfileEditor.prj
index cc07c7b..3937056 100644
--- a/demo/TimeProfileEditor/TimeProfileEditor.prj
+++ b/demo/TimeProfileEditor/TimeProfileEditor.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/TimeProfileEditor/edited_time_profiles.cfg b/demo/TimeProfileEditor/edited_time_profiles.cfg
index 2accc55..cb23deb 100644
--- a/demo/TimeProfileEditor/edited_time_profiles.cfg
+++ b/demo/TimeProfileEditor/edited_time_profiles.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 
diff --git a/demo/Transport/Transport_Demo.cfg b/demo/Transport/Transport_Demo.cfg
index dfeb6d9..d4a8bff 100644
--- a/demo/Transport/Transport_Demo.cfg
+++ b/demo/Transport/Transport_Demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL | TTCN_MATCHING | TTCN_DEBUG
diff --git a/demo/Transport/Transport_Demo.prj b/demo/Transport/Transport_Demo.prj
index 288602c..41d0f9a 100755
--- a/demo/Transport/Transport_Demo.prj
+++ b/demo/Transport/Transport_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Transport/Transport_Demo.ttcn b/demo/Transport/Transport_Demo.ttcn
index 66f0354..26a17ac 100755
--- a/demo/Transport/Transport_Demo.ttcn
+++ b/demo/Transport/Transport_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module Transport_Demo
 {
diff --git a/demo/Transport/makefile_patch.sh b/demo/Transport/makefile_patch.sh
index 0f2aab5..8127eca 100755
--- a/demo/Transport/makefile_patch.sh
+++ b/demo/Transport/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/demo/UIHandler/Makefile_script b/demo/UIHandler/Makefile_script
index d53037c..1a589c5 100755
--- a/demo/UIHandler/Makefile_script
+++ b/demo/UIHandler/Makefile_script
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e '
 s/CPPFLAGS = .*/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -DNO_IPV6/g
diff --git a/demo/UIHandler/README.TXT b/demo/UIHandler/README.TXT
index 0596851..fe9daaf 100644
--- a/demo/UIHandler/README.TXT
+++ b/demo/UIHandler/README.TXT
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 In order to use the project file, you have to define some variables

diff --git a/demo/UIHandler/Test1.launch b/demo/UIHandler/Test1.launch
index 941e1ae..b6eb33e 100644
--- a/demo/UIHandler/Test1.launch
+++ b/demo/UIHandler/Test1.launch
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 //                                                                           //

 ///////////////////////////////////////////////////////////////////////////////

 

diff --git a/demo/UIHandler/UIHandler_DataSource_Demo.cfg b/demo/UIHandler/UIHandler_DataSource_Demo.cfg
index e4836c9..6949d98 100644
--- a/demo/UIHandler/UIHandler_DataSource_Demo.cfg
+++ b/demo/UIHandler/UIHandler_DataSource_Demo.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/demo/UIHandler/UIHandler_DataSource_Demo.prj b/demo/UIHandler/UIHandler_DataSource_Demo.prj
index 5cec2c5..c5f35c2 100644
--- a/demo/UIHandler/UIHandler_DataSource_Demo.prj
+++ b/demo/UIHandler/UIHandler_DataSource_Demo.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/UIHandler/UI_Handler_Test.grp b/demo/UIHandler/UI_Handler_Test.grp
index f3e5ec8..004166f 100644
--- a/demo/UIHandler/UI_Handler_Test.grp
+++ b/demo/UIHandler/UI_Handler_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/UIHandler/UI_Handler_Test.prj b/demo/UIHandler/UI_Handler_Test.prj
index 40fc6f5..9de670e 100644
--- a/demo/UIHandler/UI_Handler_Test.prj
+++ b/demo/UIHandler/UI_Handler_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/UIHandler/UI_Handler_Test.ttcn b/demo/UIHandler/UI_Handler_Test.ttcn
index 3657b69..fae8a2b 100644
--- a/demo/UIHandler/UI_Handler_Test.ttcn
+++ b/demo/UIHandler/UI_Handler_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/UIHandler/cfg.cfg b/demo/UIHandler/cfg.cfg
index cac45ac..46e595b 100644
--- a/demo/UIHandler/cfg.cfg
+++ b/demo/UIHandler/cfg.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/demo/Variable/DateTimeFunctions.grp b/demo/Variable/DateTimeFunctions.grp
index d62162f..6a25be2 100644
--- a/demo/Variable/DateTimeFunctions.grp
+++ b/demo/Variable/DateTimeFunctions.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Variable/EPTF_Var_SnapshotFile.cfg b/demo/Variable/EPTF_Var_SnapshotFile.cfg
index d22e596..d1a7be3 100644
--- a/demo/Variable/EPTF_Var_SnapshotFile.cfg
+++ b/demo/Variable/EPTF_Var_SnapshotFile.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_EPTF_Var_SaveLoadSnapshot_cfg := {
diff --git a/demo/Variable/EPTF_Variable_test.prj b/demo/Variable/EPTF_Variable_test.prj
index 15b5374..877114b 100644
--- a/demo/Variable/EPTF_Variable_test.prj
+++ b/demo/Variable/EPTF_Variable_test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/Variable/EPTF_Variable_test.ttcnpp b/demo/Variable/EPTF_Variable_test.ttcnpp
index 85c7ec4..22f0d6b 100644
--- a/demo/Variable/EPTF_Variable_test.ttcnpp
+++ b/demo/Variable/EPTF_Variable_test.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Variable_test {
 
diff --git a/demo/Variable/FileIO.grp b/demo/Variable/FileIO.grp
index d7891a7..d33d687 100644
--- a/demo/Variable/FileIO.grp
+++ b/demo/Variable/FileIO.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Variable/PIPE.grp b/demo/Variable/PIPE.grp
index e652fc8..7433d5e 100644
--- a/demo/Variable/PIPE.grp
+++ b/demo/Variable/PIPE.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Variable/Variable_Demo.grp b/demo/Variable/Variable_Demo.grp
index e672b5d..8067265 100644
--- a/demo/Variable/Variable_Demo.grp
+++ b/demo/Variable/Variable_Demo.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/Variable/main.cfg b/demo/Variable/main.cfg
index 0e2fe29..eb0c5a8 100644
--- a/demo/Variable/main.cfg
+++ b/demo/Variable/main.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 LogFile := "%e.%h-%r-%t.%s"
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo.cfg b/demo/WebGUI/EPTF_WebGUI_Demo.cfg
index 8358172..4788f0a 100644
--- a/demo/WebGUI/EPTF_WebGUI_Demo.cfg
+++ b/demo/WebGUI/EPTF_WebGUI_Demo.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo.grp b/demo/WebGUI/EPTF_WebGUI_Demo.grp
index f089c40..b3dbf34 100755
--- a/demo/WebGUI/EPTF_WebGUI_Demo.grp
+++ b/demo/WebGUI/EPTF_WebGUI_Demo.grp
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo.prj b/demo/WebGUI/EPTF_WebGUI_Demo.prj
index 5b189d6..10c9f50 100755
--- a/demo/WebGUI/EPTF_WebGUI_Demo.prj
+++ b/demo/WebGUI/EPTF_WebGUI_Demo.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo.tpd b/demo/WebGUI/EPTF_WebGUI_Demo.tpd
index 15a0f53..a9c71d3 100755
--- a/demo/WebGUI/EPTF_WebGUI_Demo.tpd
+++ b/demo/WebGUI/EPTF_WebGUI_Demo.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo_Definitions.ttcn b/demo/WebGUI/EPTF_WebGUI_Demo_Definitions.ttcn
index 02ec100..bff244d 100755
--- a/demo/WebGUI/EPTF_WebGUI_Demo_Definitions.ttcn
+++ b/demo/WebGUI/EPTF_WebGUI_Demo_Definitions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo_Functions.ttcn b/demo/WebGUI/EPTF_WebGUI_Demo_Functions.ttcn
index e63f192..b0ebe5c 100755
--- a/demo/WebGUI/EPTF_WebGUI_Demo_Functions.ttcn
+++ b/demo/WebGUI/EPTF_WebGUI_Demo_Functions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo_ManyEntityGroupsAndScenarios.cfg b/demo/WebGUI/EPTF_WebGUI_Demo_ManyEntityGroupsAndScenarios.cfg
index d28cb14..e406d07 100644
--- a/demo/WebGUI/EPTF_WebGUI_Demo_ManyEntityGroupsAndScenarios.cfg
+++ b/demo/WebGUI/EPTF_WebGUI_Demo_ManyEntityGroupsAndScenarios.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/demo/WebGUI/EPTF_WebGUI_Demo_Testcases.ttcn b/demo/WebGUI/EPTF_WebGUI_Demo_Testcases.ttcn
index 12f76ae..953abb6 100755
--- a/demo/WebGUI/EPTF_WebGUI_Demo_Testcases.ttcn
+++ b/demo/WebGUI/EPTF_WebGUI_Demo_Testcases.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/demo/WebGUI/python_test.py b/demo/WebGUI/python_test.py
index c4ae52d..102a92b 100755
--- a/demo/WebGUI/python_test.py
+++ b/demo/WebGUI/python_test.py
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import urllib2
diff --git a/doc/apidocSource/Menu.txt b/doc/apidocSource/Menu.txt
index 652a444..e08f556 100644
--- a/doc/apidocSource/Menu.txt
+++ b/doc/apidocSource/Menu.txt
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 Format: 1.4
 
diff --git a/doc/apidocSource/TitanSim.html b/doc/apidocSource/TitanSim.html
index b50bb5f..9c15705 100644
--- a/doc/apidocSource/TitanSim.html
+++ b/doc/apidocSource/TitanSim.html
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html>
diff --git a/doc/apidocSource/index.html b/doc/apidocSource/index.html
index 920b949..b507b5b 100644
--- a/doc/apidocSource/index.html
+++ b/doc/apidocSource/index.html
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html><head><title></title></head>
diff --git a/src/Base/EPTF_CLL_Base.grp b/src/Base/EPTF_CLL_Base.grp
index 3ad0485..a9a1eac 100644
--- a/src/Base/EPTF_CLL_Base.grp
+++ b/src/Base/EPTF_CLL_Base.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Base/EPTF_CLL_Base.tpd b/src/Base/EPTF_CLL_Base.tpd
index b165ca3..777343c 100644
--- a/src/Base/EPTF_CLL_Base.tpd
+++ b/src/Base/EPTF_CLL_Base.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Base/EPTF_CLL_Base_Definitions.ttcn b/src/Base/EPTF_CLL_Base_Definitions.ttcn
index bded1b9..5e5e8b4 100644
--- a/src/Base/EPTF_CLL_Base_Definitions.ttcn
+++ b/src/Base/EPTF_CLL_Base_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Base/EPTF_CLL_Base_Dep.grp b/src/Base/EPTF_CLL_Base_Dep.grp
index 66233c9..a6e7595 100755
--- a/src/Base/EPTF_CLL_Base_Dep.grp
+++ b/src/Base/EPTF_CLL_Base_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/Base/EPTF_CLL_Base_ExternalFunctions.cc b/src/Base/EPTF_CLL_Base_ExternalFunctions.cc
index b8b28c9..3d90aa3 100644
--- a/src/Base/EPTF_CLL_Base_ExternalFunctions.cc
+++ b/src/Base/EPTF_CLL_Base_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Base/EPTF_CLL_Base_Functions.ttcn b/src/Base/EPTF_CLL_Base_Functions.ttcn
index 0c2e50d..2e9fc1b 100644
--- a/src/Base/EPTF_CLL_Base_Functions.ttcn
+++ b/src/Base/EPTF_CLL_Base_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Buffer/EPTF_CLL_Buffer.grp b/src/Buffer/EPTF_CLL_Buffer.grp
index daa7c3d..245f405 100644
--- a/src/Buffer/EPTF_CLL_Buffer.grp
+++ b/src/Buffer/EPTF_CLL_Buffer.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Buffer/EPTF_CLL_Buffer.tpd b/src/Buffer/EPTF_CLL_Buffer.tpd
index 7fbcbdc..d3e1419 100644
--- a/src/Buffer/EPTF_CLL_Buffer.tpd
+++ b/src/Buffer/EPTF_CLL_Buffer.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Buffer/EPTF_CLL_Buffer_Definitions.ttcn b/src/Buffer/EPTF_CLL_Buffer_Definitions.ttcn
index 19f882d..7b51576 100644
--- a/src/Buffer/EPTF_CLL_Buffer_Definitions.ttcn
+++ b/src/Buffer/EPTF_CLL_Buffer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Buffer/EPTF_CLL_Buffer_Dep.grp b/src/Buffer/EPTF_CLL_Buffer_Dep.grp
index 9bad859..0856baa 100755
--- a/src/Buffer/EPTF_CLL_Buffer_Dep.grp
+++ b/src/Buffer/EPTF_CLL_Buffer_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/Buffer/EPTF_CLL_Buffer_ExternalFunctions.cc b/src/Buffer/EPTF_CLL_Buffer_ExternalFunctions.cc
index dfaa872..02b1bca 100644
--- a/src/Buffer/EPTF_CLL_Buffer_ExternalFunctions.cc
+++ b/src/Buffer/EPTF_CLL_Buffer_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include "EPTF_CLL_Buffer_Functions.hh"
diff --git a/src/Buffer/EPTF_CLL_Buffer_Functions.ttcn b/src/Buffer/EPTF_CLL_Buffer_Functions.ttcn
index 3435e7e..c64d3d2 100644
--- a/src/Buffer/EPTF_CLL_Buffer_Functions.ttcn
+++ b/src/Buffer/EPTF_CLL_Buffer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CSAdmin_Functions.ttcn b/src/CentralScheduling/EPTF_CLL_CSAdmin_Functions.ttcn
index 0752157..319ff50 100644
--- a/src/CentralScheduling/EPTF_CLL_CSAdmin_Functions.ttcn
+++ b/src/CentralScheduling/EPTF_CLL_CSAdmin_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CSLB_Functions.ttcn b/src/CentralScheduling/EPTF_CLL_CSLB_Functions.ttcn
index eaa0c66..0e4235c 100644
--- a/src/CentralScheduling/EPTF_CLL_CSLB_Functions.ttcn
+++ b/src/CentralScheduling/EPTF_CLL_CSLB_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CSUIHandler_Definitions.ttcn b/src/CentralScheduling/EPTF_CLL_CSUIHandler_Definitions.ttcn
index d46d027..14214b0 100644
--- a/src/CentralScheduling/EPTF_CLL_CSUIHandler_Definitions.ttcn
+++ b/src/CentralScheduling/EPTF_CLL_CSUIHandler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CSUIHandler_Functions.ttcn b/src/CentralScheduling/EPTF_CLL_CSUIHandler_Functions.ttcn
index d5f460c..d392e26 100644
--- a/src/CentralScheduling/EPTF_CLL_CSUIHandler_Functions.ttcn
+++ b/src/CentralScheduling/EPTF_CLL_CSUIHandler_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CS_DSFunctions.ttcn b/src/CentralScheduling/EPTF_CLL_CS_DSFunctions.ttcn
index 154e037..29f177b 100644
--- a/src/CentralScheduling/EPTF_CLL_CS_DSFunctions.ttcn
+++ b/src/CentralScheduling/EPTF_CLL_CS_DSFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CS_Definitions.ttcn b/src/CentralScheduling/EPTF_CLL_CS_Definitions.ttcn
index 334430e..eace0a8 100644
--- a/src/CentralScheduling/EPTF_CLL_CS_Definitions.ttcn
+++ b/src/CentralScheduling/EPTF_CLL_CS_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CentralScheduling/EPTF_CLL_CentralScheduling.grp b/src/CentralScheduling/EPTF_CLL_CentralScheduling.grp
index 204b6da..b9ba85c 100644
--- a/src/CentralScheduling/EPTF_CLL_CentralScheduling.grp
+++ b/src/CentralScheduling/EPTF_CLL_CentralScheduling.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/CentralScheduling/EPTF_CLL_CentralScheduling.tpd b/src/CentralScheduling/EPTF_CLL_CentralScheduling.tpd
index b4ee956..0c37085 100644
--- a/src/CentralScheduling/EPTF_CLL_CentralScheduling.tpd
+++ b/src/CentralScheduling/EPTF_CLL_CentralScheduling.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.grp b/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.grp
index 2059142..01431d1 100644
--- a/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.grp
+++ b/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.tpd b/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.tpd
index fa0490a..0fe49f9 100644
--- a/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.tpd
+++ b/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler_Dep.grp b/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler_Dep.grp
index ab62674..e46e1a2 100755
--- a/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler_Dep.grp
+++ b/src/CentralScheduling/EPTF_CLL_CentralSchedulingUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/CentralScheduling/EPTF_CLL_CentralScheduling_Dep.grp b/src/CentralScheduling/EPTF_CLL_CentralScheduling_Dep.grp
index 92a7108..2a2073e 100755
--- a/src/CentralScheduling/EPTF_CLL_CentralScheduling_Dep.grp
+++ b/src/CentralScheduling/EPTF_CLL_CentralScheduling_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/CommandLineInterface/EPTF_CLL_CLI.grp b/src/CommandLineInterface/EPTF_CLL_CLI.grp
index 30cc48c..cbc0e27 100644
--- a/src/CommandLineInterface/EPTF_CLL_CLI.grp
+++ b/src/CommandLineInterface/EPTF_CLL_CLI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/CommandLineInterface/EPTF_CLL_CLI.tpd b/src/CommandLineInterface/EPTF_CLL_CLI.tpd
index 0af6df5..eda324f 100644
--- a/src/CommandLineInterface/EPTF_CLL_CLI.tpd
+++ b/src/CommandLineInterface/EPTF_CLL_CLI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/CommandLineInterface/EPTF_CLL_CLI_Definitions.ttcn b/src/CommandLineInterface/EPTF_CLL_CLI_Definitions.ttcn
index 34e07cf..1459b8c 100644
--- a/src/CommandLineInterface/EPTF_CLL_CLI_Definitions.ttcn
+++ b/src/CommandLineInterface/EPTF_CLL_CLI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CommandLineInterface/EPTF_CLL_CLI_Functions.ttcn b/src/CommandLineInterface/EPTF_CLL_CLI_Functions.ttcn
index 36374bd..e1a4fe7 100644
--- a/src/CommandLineInterface/EPTF_CLL_CLI_Functions.ttcn
+++ b/src/CommandLineInterface/EPTF_CLL_CLI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/CommandLineInterface/EPTF_CLL_CommandLineInterface_Dep.grp b/src/CommandLineInterface/EPTF_CLL_CommandLineInterface_Dep.grp
index 8d96d41..d6e851c 100755
--- a/src/CommandLineInterface/EPTF_CLL_CommandLineInterface_Dep.grp
+++ b/src/CommandLineInterface/EPTF_CLL_CommandLineInterface_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Common/EPTF_CLL_Common.grp b/src/Common/EPTF_CLL_Common.grp
index 09ec045..290643a 100644
--- a/src/Common/EPTF_CLL_Common.grp
+++ b/src/Common/EPTF_CLL_Common.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Common/EPTF_CLL_Common.tpd b/src/Common/EPTF_CLL_Common.tpd
index 48d3708..30bb6cb 100644
--- a/src/Common/EPTF_CLL_Common.tpd
+++ b/src/Common/EPTF_CLL_Common.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Common/EPTF_CLL_Common_Definitions.ttcn b/src/Common/EPTF_CLL_Common_Definitions.ttcn
index 7ab1c57..177b27e 100644
--- a/src/Common/EPTF_CLL_Common_Definitions.ttcn
+++ b/src/Common/EPTF_CLL_Common_Definitions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_Dep.grp b/src/Common/EPTF_CLL_Common_Dep.grp
index b1b5571..9887625 100755
--- a/src/Common/EPTF_CLL_Common_Dep.grp
+++ b/src/Common/EPTF_CLL_Common_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/Common/EPTF_CLL_Common_ExternalFunctions.cc b/src/Common/EPTF_CLL_Common_ExternalFunctions.cc
index 184de1b..8dc7a71 100644
--- a/src/Common/EPTF_CLL_Common_ExternalFunctions.cc
+++ b/src/Common/EPTF_CLL_Common_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Common/EPTF_CLL_Common_Functions.ttcn b/src/Common/EPTF_CLL_Common_Functions.ttcn
index 577d200..b3ef121 100644
--- a/src/Common/EPTF_CLL_Common_Functions.ttcn
+++ b/src/Common/EPTF_CLL_Common_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_IndexArrayDefinitions.ttcn b/src/Common/EPTF_CLL_Common_IndexArrayDefinitions.ttcn
index 8f530bc..d2ee029 100644
--- a/src/Common/EPTF_CLL_Common_IndexArrayDefinitions.ttcn
+++ b/src/Common/EPTF_CLL_Common_IndexArrayDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_IndexArrayFunctions.ttcn b/src/Common/EPTF_CLL_Common_IndexArrayFunctions.ttcn
index 003223d..5115b45 100644
--- a/src/Common/EPTF_CLL_Common_IndexArrayFunctions.ttcn
+++ b/src/Common/EPTF_CLL_Common_IndexArrayFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_PrivateDebugDefinitions.ttcnpp b/src/Common/EPTF_CLL_Common_PrivateDebugDefinitions.ttcnpp
index 3458122..b017286 100644
--- a/src/Common/EPTF_CLL_Common_PrivateDebugDefinitions.ttcnpp
+++ b/src/Common/EPTF_CLL_Common_PrivateDebugDefinitions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_RndDefinitions.ttcn b/src/Common/EPTF_CLL_Common_RndDefinitions.ttcn
index 70a8dd1..46bd5c5 100644
--- a/src/Common/EPTF_CLL_Common_RndDefinitions.ttcn
+++ b/src/Common/EPTF_CLL_Common_RndDefinitions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Common/EPTF_CLL_Common_RndFunctions.ttcn b/src/Common/EPTF_CLL_Common_RndFunctions.ttcn
index f99093a..b150c18 100644
--- a/src/Common/EPTF_CLL_Common_RndFunctions.ttcn
+++ b/src/Common/EPTF_CLL_Common_RndFunctions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DataSource/EPTF_CLL_DataSource.grp b/src/DataSource/EPTF_CLL_DataSource.grp
index 8be48a8..d70384d 100644
--- a/src/DataSource/EPTF_CLL_DataSource.grp
+++ b/src/DataSource/EPTF_CLL_DataSource.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/DataSource/EPTF_CLL_DataSource.tpd b/src/DataSource/EPTF_CLL_DataSource.tpd
index 8bbe637..66d2378 100644
--- a/src/DataSource/EPTF_CLL_DataSource.tpd
+++ b/src/DataSource/EPTF_CLL_DataSource.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/DataSource/EPTF_CLL_DataSourceClient_Functions.ttcn b/src/DataSource/EPTF_CLL_DataSourceClient_Functions.ttcn
index 8dded97..59ed3b7 100644
--- a/src/DataSource/EPTF_CLL_DataSourceClient_Functions.ttcn
+++ b/src/DataSource/EPTF_CLL_DataSourceClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DataSource/EPTF_CLL_DataSource_Apidoc.ttcn b/src/DataSource/EPTF_CLL_DataSource_Apidoc.ttcn
index dc19553..a192b29 100644
--- a/src/DataSource/EPTF_CLL_DataSource_Apidoc.ttcn
+++ b/src/DataSource/EPTF_CLL_DataSource_Apidoc.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DataSource/EPTF_CLL_DataSource_Definitions.ttcn b/src/DataSource/EPTF_CLL_DataSource_Definitions.ttcn
index 33866d9..e585da4 100644
--- a/src/DataSource/EPTF_CLL_DataSource_Definitions.ttcn
+++ b/src/DataSource/EPTF_CLL_DataSource_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DataSource/EPTF_CLL_DataSource_Dep.grp b/src/DataSource/EPTF_CLL_DataSource_Dep.grp
index afb7db5..019c378 100755
--- a/src/DataSource/EPTF_CLL_DataSource_Dep.grp
+++ b/src/DataSource/EPTF_CLL_DataSource_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/DataSource/EPTF_CLL_DataSource_ExternalFunctions.cc b/src/DataSource/EPTF_CLL_DataSource_ExternalFunctions.cc
index 4d3c95f..ce0c4d2 100644
--- a/src/DataSource/EPTF_CLL_DataSource_ExternalFunctions.cc
+++ b/src/DataSource/EPTF_CLL_DataSource_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn b/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn
index 00aa4e5..2381ada 100644
--- a/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn
+++ b/src/DataSource/EPTF_CLL_DataSource_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
@@ -2338,9 +2338,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/Api/Js/DsRestAPI.js b/src/DsRestAPI/Api/Js/DsRestAPI.js
index 1493ea8..c81c8f2 100644
--- a/src/DsRestAPI/Api/Js/DsRestAPI.js
+++ b/src/DsRestAPI/Api/Js/DsRestAPI.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 /** DsRestAPI DataSource API calls */
 
diff --git a/src/DsRestAPI/Api/Js/DsRestAPIComm.js b/src/DsRestAPI/Api/Js/DsRestAPIComm.js
index 104bec6..687276a 100644
--- a/src/DsRestAPI/Api/Js/DsRestAPIComm.js
+++ b/src/DsRestAPI/Api/Js/DsRestAPIComm.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function CDsRestAPIComm(p_extension) {

     "use strict";

diff --git a/src/DsRestAPI/Api/Python/DsRestAPI.py b/src/DsRestAPI/Api/Python/DsRestAPI.py
index 846903d..5c8fad4 100755
--- a/src/DsRestAPI/Api/Python/DsRestAPI.py
+++ b/src/DsRestAPI/Api/Python/DsRestAPI.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import sys
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp b/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp
index 877a349..e2193a5 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI.tpd b/src/DsRestAPI/EPTF_CLL_DsRestAPI.tpd
index 62eadef..c13ff0d 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI.tpd
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Definitions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Definitions.ttcn
index 48eea3f..c302241 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Definitions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Functions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Functions.ttcn
index 9856779..feea464 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Functions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Definitions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Definitions.ttcn
index 9e7e3d0..dd904d3 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Definitions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp
index d4d33cc..c0dd99a 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_ExternalFunctions.cc b/src/DsRestAPI/EPTF_CLL_DsRestAPI_ExternalFunctions.cc
index 541c4fe..23b8ab5 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_ExternalFunctions.cc
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Definitions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Definitions.ttcn
index b105a51..89fbf77 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Definitions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Functions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Functions.ttcn
index 2a8cd12..f42af7b 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Functions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Functions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Functions.ttcn
index 0d0a324..75b179c 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Functions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Definitions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Definitions.ttcn
index 47da4b3..1029d5e 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Definitions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Functions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Functions.ttcn
index 17d1219..9e5ee80 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Functions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_HTTPServer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Definitions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Definitions.ttcn
index 896a81c..a44c4ba 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Definitions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Functions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Functions.ttcn
index e6c2c45..cee0277 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Functions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Definitions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Definitions.ttcn
index 1bbe958..6f9a253 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Definitions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_ExternalFunctions.cc b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_ExternalFunctions.cc
index 9d847dd..ab1558c 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_ExternalFunctions.cc
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_ExternalFunctions.cc
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 #include <deque>
 #include <string>
diff --git a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Functions.ttcn b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Functions.ttcn
index fac06a3..33b6e80 100644
--- a/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Functions.ttcn
+++ b/src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl.grp b/src/ExecCtrl/EPTF_CLL_ExecCtrl.grp
index 91356ef..8e6842d 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl.grp
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 //                                                                           //

 ///////////////////////////////////////////////////////////////////////////////

 

diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl.tpd b/src/ExecCtrl/EPTF_CLL_ExecCtrl.tpd
index aad5230..967d45e 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl.tpd
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlClient_Functions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrlClient_Functions.ttcn
index 5012143..e4b65bb 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlClient_Functions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlTimeProfile_Definitions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrlTimeProfile_Definitions.ttcn
index fc460c1..32ec3fb 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlTimeProfile_Definitions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlTimeProfile_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler.grp b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler.grp
index b173e40..d8be950 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler.grp
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Definitions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Definitions.ttcn
index d376f16..728c3fc 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Definitions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp
index 90db874..edb6e52 100755
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn
index d4e2e9c..5830516 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIDefinitions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIDefinitions.ttcn
index 6338058..63b7187 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIDefinitions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIFunctions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIFunctions.ttcn
index 8e793d0..9a83463 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIFunctions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_DSFunctions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_DSFunctions.ttcn
index dabf01f..3db81cd 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_DSFunctions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_DSFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_Definitions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_Definitions.ttcn
index c330df6..27e1ed7 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_Definitions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp b/src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp
index 4ac731a..02cfb3b 100755
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_Functions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_Functions.ttcn
index 6e370d7..c21d109 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_Functions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_LoggingFunctions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_LoggingFunctions.ttcn
index 1cb4c8c..880aa9f 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_LoggingFunctions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_LoggingFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseDefinitions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseDefinitions.ttcn
index 47799b8..5f1b0ba 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseDefinitions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseFunctions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseFunctions.ttcn
index 02ea8fc..c94120f 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseFunctions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioDefinitions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioDefinitions.ttcn
index 9829dc3..8f3628d 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioDefinitions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioFunctions.ttcn b/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioFunctions.ttcn
index a6482ef..25a88d3 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioFunctions.ttcn
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ExecCtrl/EPTF_CLL_ExecCtrl_UI.tpd b/src/ExecCtrl/EPTF_CLL_ExecCtrl_UI.tpd
index 4628a5e..93dc646 100644
--- a/src/ExecCtrl/EPTF_CLL_ExecCtrl_UI.tpd
+++ b/src/ExecCtrl/EPTF_CLL_ExecCtrl_UI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/FreeBusyQueue/EPTF_CLL_FBQ.tpd b/src/FreeBusyQueue/EPTF_CLL_FBQ.tpd
index 967f272..523e995 100644
--- a/src/FreeBusyQueue/EPTF_CLL_FBQ.tpd
+++ b/src/FreeBusyQueue/EPTF_CLL_FBQ.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/FreeBusyQueue/EPTF_CLL_FBQ_Definitions.ttcn b/src/FreeBusyQueue/EPTF_CLL_FBQ_Definitions.ttcn
index 75d6b73..aa42508 100644
--- a/src/FreeBusyQueue/EPTF_CLL_FBQ_Definitions.ttcn
+++ b/src/FreeBusyQueue/EPTF_CLL_FBQ_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/FreeBusyQueue/EPTF_CLL_FBQ_Functions.ttcn b/src/FreeBusyQueue/EPTF_CLL_FBQ_Functions.ttcn
index 49948a9..fec1cd6 100644
--- a/src/FreeBusyQueue/EPTF_CLL_FBQ_Functions.ttcn
+++ b/src/FreeBusyQueue/EPTF_CLL_FBQ_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue.grp b/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue.grp
index 3e87330..8af6bca 100644
--- a/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue.grp
+++ b/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue_Dep.grp b/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue_Dep.grp
index 30d05e4..2cdcb88 100755
--- a/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue_Dep.grp
+++ b/src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/GUIViewer/EPTF_CLL_GUIViewer.grp b/src/GUIViewer/EPTF_CLL_GUIViewer.grp
index d2c6ddc..4af162c 100644
--- a/src/GUIViewer/EPTF_CLL_GUIViewer.grp
+++ b/src/GUIViewer/EPTF_CLL_GUIViewer.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/GUIViewer/EPTF_CLL_GUIViewer.tpd b/src/GUIViewer/EPTF_CLL_GUIViewer.tpd
index c68f160..8244289 100644
--- a/src/GUIViewer/EPTF_CLL_GUIViewer.tpd
+++ b/src/GUIViewer/EPTF_CLL_GUIViewer.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/GUIViewer/EPTF_CLL_GUIViewer.xml b/src/GUIViewer/EPTF_CLL_GUIViewer.xml
index b29bf5a..3f6fd8b 100644
--- a/src/GUIViewer/EPTF_CLL_GUIViewer.xml
+++ b/src/GUIViewer/EPTF_CLL_GUIViewer.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/src/GUIViewer/EPTF_CLL_GUIViewer_Functions.ttcn b/src/GUIViewer/EPTF_CLL_GUIViewer_Functions.ttcn
index f2dd1ee..a1fedea 100644
--- a/src/GUIViewer/EPTF_CLL_GUIViewer_Functions.ttcn
+++ b/src/GUIViewer/EPTF_CLL_GUIViewer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HashMap/EPTF_CLL_HashMap.grp b/src/HashMap/EPTF_CLL_HashMap.grp
index a053d35..d60c59d 100644
--- a/src/HashMap/EPTF_CLL_HashMap.grp
+++ b/src/HashMap/EPTF_CLL_HashMap.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/HashMap/EPTF_CLL_HashMap.tpd b/src/HashMap/EPTF_CLL_HashMap.tpd
index f1740b4..f6bae15 100644
--- a/src/HashMap/EPTF_CLL_HashMap.tpd
+++ b/src/HashMap/EPTF_CLL_HashMap.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/HashMap/EPTF_CLL_HashMapInt2Int_ExternalFunctions.cc b/src/HashMap/EPTF_CLL_HashMapInt2Int_ExternalFunctions.cc
index dc8d966..ceb9191 100644
--- a/src/HashMap/EPTF_CLL_HashMapInt2Int_ExternalFunctions.cc
+++ b/src/HashMap/EPTF_CLL_HashMapInt2Int_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Purpose:
diff --git a/src/HashMap/EPTF_CLL_HashMapInt2Int_Functions.ttcn b/src/HashMap/EPTF_CLL_HashMapInt2Int_Functions.ttcn
index 3e355ce..e1e52b2 100644
--- a/src/HashMap/EPTF_CLL_HashMapInt2Int_Functions.ttcn
+++ b/src/HashMap/EPTF_CLL_HashMapInt2Int_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Detailed Comments:
diff --git a/src/HashMap/EPTF_CLL_HashMapOct2Int_ExternalFunctions.cc b/src/HashMap/EPTF_CLL_HashMapOct2Int_ExternalFunctions.cc
index 8a8d53e..9b061f1 100644
--- a/src/HashMap/EPTF_CLL_HashMapOct2Int_ExternalFunctions.cc
+++ b/src/HashMap/EPTF_CLL_HashMapOct2Int_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Purpose:
diff --git a/src/HashMap/EPTF_CLL_HashMapOct2Int_Functions.ttcn b/src/HashMap/EPTF_CLL_HashMapOct2Int_Functions.ttcn
index 09ed5f4..6e9a562 100644
--- a/src/HashMap/EPTF_CLL_HashMapOct2Int_Functions.ttcn
+++ b/src/HashMap/EPTF_CLL_HashMapOct2Int_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Detailed Comments:
diff --git a/src/HashMap/EPTF_CLL_HashMapStr2Int_ExternalFunctions.cc b/src/HashMap/EPTF_CLL_HashMapStr2Int_ExternalFunctions.cc
index fa2e663..5b77b90 100644
--- a/src/HashMap/EPTF_CLL_HashMapStr2Int_ExternalFunctions.cc
+++ b/src/HashMap/EPTF_CLL_HashMapStr2Int_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Purpose:
diff --git a/src/HashMap/EPTF_CLL_HashMapStr2Int_Functions.ttcn b/src/HashMap/EPTF_CLL_HashMapStr2Int_Functions.ttcn
index 87318a2..38b0370 100644
--- a/src/HashMap/EPTF_CLL_HashMapStr2Int_Functions.ttcn
+++ b/src/HashMap/EPTF_CLL_HashMapStr2Int_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Detailed Comments:
diff --git a/src/HashMap/EPTF_CLL_HashMap_Definitions.ttcn b/src/HashMap/EPTF_CLL_HashMap_Definitions.ttcn
index 3a58d3e..3982d4a 100644
--- a/src/HashMap/EPTF_CLL_HashMap_Definitions.ttcn
+++ b/src/HashMap/EPTF_CLL_HashMap_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Detailed Comments:
diff --git a/src/HashMap/EPTF_CLL_HashMap_Dep.grp b/src/HashMap/EPTF_CLL_HashMap_Dep.grp
index f54d1c2..3c86e6f 100755
--- a/src/HashMap/EPTF_CLL_HashMap_Dep.grp
+++ b/src/HashMap/EPTF_CLL_HashMap_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/HashMap/EPTF_CLL_HashMap_ExternalFunctions.hh b/src/HashMap/EPTF_CLL_HashMap_ExternalFunctions.hh
index 3167440..6b229b1 100644
--- a/src/HashMap/EPTF_CLL_HashMap_ExternalFunctions.hh
+++ b/src/HashMap/EPTF_CLL_HashMap_ExternalFunctions.hh
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////  Purpose:
diff --git a/src/HashMap/EPTF_CLL_HashMap_Functions.ttcn b/src/HashMap/EPTF_CLL_HashMap_Functions.ttcn
index 7456d0e..ac2b406 100644
--- a/src/HashMap/EPTF_CLL_HashMap_Functions.ttcn
+++ b/src/HashMap/EPTF_CLL_HashMap_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////  Detailed Comments:

diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin.grp b/src/HostAdmin/EPTF_CLL_HostAdmin.grp
index a5f8712..00bc0b2 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin.grp
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin.tpd b/src/HostAdmin/EPTF_CLL_HostAdmin.tpd
index 47eaf59..d30f224 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin.tpd
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/HostAdmin/EPTF_CLL_HostAdminServer_Definitions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdminServer_Definitions.ttcn
index 136ceb3..e2971df 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdminServer_Definitions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdminServer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdminServer_Functions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdminServer_Functions.ttcn
index 03ce725..0fb8eeb 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdminServer_Functions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdminServer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdminUI.grp b/src/HostAdmin/EPTF_CLL_HostAdminUI.grp
index e6b9094..d688492 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdminUI.grp
+++ b/src/HostAdmin/EPTF_CLL_HostAdminUI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/HostAdmin/EPTF_CLL_HostAdminUIHandler_Dep.grp b/src/HostAdmin/EPTF_CLL_HostAdminUIHandler_Dep.grp
index 02691a9..7058e8b 100755
--- a/src/HostAdmin/EPTF_CLL_HostAdminUIHandler_Dep.grp
+++ b/src/HostAdmin/EPTF_CLL_HostAdminUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 //                                                                           //

 ///////////////////////////////////////////////////////////////////////////////

 -->

diff --git a/src/HostAdmin/EPTF_CLL_HostAdminUI_Definitions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdminUI_Definitions.ttcn
index e31bf90..b08abee 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdminUI_Definitions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdminUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdminUI_Functions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdminUI_Functions.ttcn
index 633e1e6..3812506 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdminUI_Functions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdminUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_BaseDefinitions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdmin_BaseDefinitions.ttcn
index 570ecc1..a1894af 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_BaseDefinitions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_BaseDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_BaseFunctions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdmin_BaseFunctions.ttcn
index abd9a74..516ecad 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_BaseFunctions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_BaseFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_DSFunctions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdmin_DSFunctions.ttcn
index 80a6b9c..3ec22f8 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_DSFunctions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_DSFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_Definitions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdmin_Definitions.ttcn
index d2793bc..91033d8 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_Definitions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp b/src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp
index 1d5f07a..f7d15a9 100755
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_Functions.ttcn b/src/HostAdmin/EPTF_CLL_HostAdmin_Functions.ttcn
index 4eb0cf1..ca4fa1c 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_Functions.ttcn
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/HostAdmin/EPTF_CLL_HostAdmin_UI.tpd b/src/HostAdmin/EPTF_CLL_HostAdmin_UI.tpd
index f1127c3..1932021 100644
--- a/src/HostAdmin/EPTF_CLL_HostAdmin_UI.tpd
+++ b/src/HostAdmin/EPTF_CLL_HostAdmin_UI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/ILog/EPTF_CLL_ILog.grp b/src/ILog/EPTF_CLL_ILog.grp
index 92e3341..3e93747 100644
--- a/src/ILog/EPTF_CLL_ILog.grp
+++ b/src/ILog/EPTF_CLL_ILog.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/ILog/EPTF_CLL_ILog.tpd b/src/ILog/EPTF_CLL_ILog.tpd
index 85277be..acfcdf5 100644
--- a/src/ILog/EPTF_CLL_ILog.tpd
+++ b/src/ILog/EPTF_CLL_ILog.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/ILog/EPTF_CLL_ILogString.grp b/src/ILog/EPTF_CLL_ILogString.grp
index bc01845..1b3dd1d 100644
--- a/src/ILog/EPTF_CLL_ILogString.grp
+++ b/src/ILog/EPTF_CLL_ILogString.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/ILog/EPTF_CLL_ILogString.tpd b/src/ILog/EPTF_CLL_ILogString.tpd
index decc87e..a9484e7 100644
--- a/src/ILog/EPTF_CLL_ILogString.tpd
+++ b/src/ILog/EPTF_CLL_ILogString.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/ILog/EPTF_CLL_ILogString_Definitions.ttcn b/src/ILog/EPTF_CLL_ILogString_Definitions.ttcn
index 3f49fab..97103fe 100644
--- a/src/ILog/EPTF_CLL_ILogString_Definitions.ttcn
+++ b/src/ILog/EPTF_CLL_ILogString_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ILog/EPTF_CLL_ILogString_Functions.ttcn b/src/ILog/EPTF_CLL_ILogString_Functions.ttcn
index d873259..a33cc7d 100644
--- a/src/ILog/EPTF_CLL_ILogString_Functions.ttcn
+++ b/src/ILog/EPTF_CLL_ILogString_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ILog/EPTF_CLL_ILog_Definitions.ttcn b/src/ILog/EPTF_CLL_ILog_Definitions.ttcn
index cb16bf3..e81d001 100644
--- a/src/ILog/EPTF_CLL_ILog_Definitions.ttcn
+++ b/src/ILog/EPTF_CLL_ILog_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/ILog/EPTF_CLL_ILog_Functions.ttcn b/src/ILog/EPTF_CLL_ILog_Functions.ttcn
index 72e3994..3fe0fb9 100644
--- a/src/ILog/EPTF_CLL_ILog_Functions.ttcn
+++ b/src/ILog/EPTF_CLL_ILog_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase.grp b/src/LGenBase/EPTF_CLL_LGenBase.grp
index 2c18ffb..da6b583 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBase.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LGenBase/EPTF_CLL_LGenBase.tpd b/src/LGenBase/EPTF_CLL_LGenBase.tpd
index a76d882..216173e 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase.tpd
+++ b/src/LGenBase/EPTF_CLL_LGenBase.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseStats.grp b/src/LGenBase/EPTF_CLL_LGenBaseStats.grp
index 4471347..bfeaa60 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseStats.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBaseStats.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseStatsUI.grp b/src/LGenBase/EPTF_CLL_LGenBaseStatsUI.grp
index 6e1c91a..c4c3176 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseStatsUI.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBaseStatsUI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Definitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Definitions.ttcn
index e02ac2f..ec5fe04 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Definitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Functions.ttcn b/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Functions.ttcn
index 54686ea..5a5c020 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Functions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseStats_Definitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBaseStats_Definitions.ttcn
index 1bfc93f..455d110 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseStats_Definitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBaseStats_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseStats_Functions.ttcn b/src/LGenBase/EPTF_CLL_LGenBaseStats_Functions.ttcn
index 1bef5a4..ab61d84 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseStats_Functions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBaseStats_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Definitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Definitions.ttcn
index 46b97e8..c56c38b 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Definitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Functions.ttcn b/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Functions.ttcn
index 75c5cbd..bb174e8 100644
--- a/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Functions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBaseUIHandler_Dep.grp b/src/LGenBase/EPTF_CLL_LGenBaseUIHandler_Dep.grp
index 3da1f9b..80fc579 100755
--- a/src/LGenBase/EPTF_CLL_LGenBaseUIHandler_Dep.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBaseUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_All.grp b/src/LGenBase/EPTF_CLL_LGenBase_All.grp
index 8a8dc4a..46f7790 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_All.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBase_All.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_ConfigDefinitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_ConfigDefinitions.ttcn
index 013ed8b..b826271 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_ConfigDefinitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_ConfigDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn
index 0632c6b..cca1f94 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_DSFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_DSFunctions.ttcn
index acae3a1..fb73c62 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_DSFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_DSFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_Definitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_Definitions.ttcn
index 14a8338..171af64 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_Definitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_Dep.grp b/src/LGenBase/EPTF_CLL_LGenBase_Dep.grp
index 3e9d71b..d11457e 100755
--- a/src/LGenBase/EPTF_CLL_LGenBase_Dep.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBase_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingExternalFunctions.cc b/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingExternalFunctions.cc
index 3fb9676..3d72265 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingExternalFunctions.cc
+++ b/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingFunctions.ttcn
index 26b57ae..6331b93 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_EventHandlingFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/LGenBase/EPTF_CLL_LGenBase_External.grp b/src/LGenBase/EPTF_CLL_LGenBase_External.grp
index 3de5ce1..46f4fa6 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_External.grp
+++ b/src/LGenBase/EPTF_CLL_LGenBase_External.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_ExternalFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_ExternalFunctions.ttcn
index 410e478..f44de97 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_ExternalFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_ExternalFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_Functions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_Functions.ttcn
index 584d488..acd0950 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_Functions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_ILog_Definitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_ILog_Definitions.ttcn
index 341d477..54f7050 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_ILog_Definitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_ILog_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_ILog_Functions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_ILog_Functions.ttcn
index b54aba1..1a5d5b0 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_ILog_Functions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_ILog_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_LoggingDefinitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_LoggingDefinitions.ttcn
index 39bb932..eadb87f 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_LoggingDefinitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_LoggingDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_LoggingFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_LoggingFunctions.ttcn
index 96c7c69..4c61222 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_LoggingFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_LoggingFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/LGenBase/EPTF_CLL_LGenBase_PhaseConfigFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_PhaseConfigFunctions.ttcn
index ceb5b55..3d2574a 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_PhaseConfigFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_PhaseConfigFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_PhaseDefinitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_PhaseDefinitions.ttcn
index dbafb22..ecad041 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_PhaseDefinitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_PhaseDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_PhaseFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_PhaseFunctions.ttcn
index 12c02cb..815235f 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_PhaseFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_PhaseFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_StepFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_StepFunctions.ttcn
index cfb272c..90c703f 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_StepFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_StepFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/LGenBase/EPTF_CLL_LGenBase_TemplateDefinitions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_TemplateDefinitions.ttcn
index 05736b6..2ac5b0c 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_TemplateDefinitions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_TemplateDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_TemplateFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_TemplateFunctions.ttcn
index 3fd23ba..63e5171 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_TemplateFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_TemplateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn b/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn
index 9ebc378..962b08f 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn
+++ b/src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LGenBase/EPTF_CLL_LGenBase_UI.tpd b/src/LGenBase/EPTF_CLL_LGenBase_UI.tpd
index 830697d..25151a5 100644
--- a/src/LGenBase/EPTF_CLL_LGenBase_UI.tpd
+++ b/src/LGenBase/EPTF_CLL_LGenBase_UI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulator.grp b/src/LoadRegulator/EPTF_CLL_LoadRegulator.grp
index ced4864..4948c9d 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulator.grp
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulator.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulator.tpd b/src/LoadRegulator/EPTF_CLL_LoadRegulator.tpd
index 86c313e..fdce7ab 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulator.tpd
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulator.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.grp b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.grp
index 90b63cc..2d9a3e9 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.grp
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.tpd b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.tpd
index 6228123..9d188b8 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.tpd
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUIHandler_Dep.grp b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUIHandler_Dep.grp
index 1e5b8be..dbb2ac6 100755
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUIHandler_Dep.grp
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Definitions.ttcn b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Definitions.ttcn
index e7af1e7..781f11a 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Definitions.ttcn
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Functions.ttcn b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Functions.ttcn
index 7efda69..50c418f 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Functions.ttcn
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulator_Definitions.ttcn b/src/LoadRegulator/EPTF_CLL_LoadRegulator_Definitions.ttcn
index 6b00659..d2f38eb 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulator_Definitions.ttcn
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulator_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp b/src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp
index c32d4aa..fa2a8c6 100755
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/LoadRegulator/EPTF_CLL_LoadRegulator_Functions.ttcn b/src/LoadRegulator/EPTF_CLL_LoadRegulator_Functions.ttcn
index 3a7b5a5..1a749a0 100644
--- a/src/LoadRegulator/EPTF_CLL_LoadRegulator_Functions.ttcn
+++ b/src/LoadRegulator/EPTF_CLL_LoadRegulator_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_Logging.grp b/src/Logging/EPTF_CLL_Logging.grp
index deb03cd..a7b26f6 100644
--- a/src/Logging/EPTF_CLL_Logging.grp
+++ b/src/Logging/EPTF_CLL_Logging.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Logging/EPTF_CLL_Logging.tpd b/src/Logging/EPTF_CLL_Logging.tpd
index e8317af..821f61a 100644
--- a/src/Logging/EPTF_CLL_Logging.tpd
+++ b/src/Logging/EPTF_CLL_Logging.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Logging/EPTF_CLL_LoggingCS.grp b/src/Logging/EPTF_CLL_LoggingCS.grp
index f85f6a6..f46eb8d 100644
--- a/src/Logging/EPTF_CLL_LoggingCS.grp
+++ b/src/Logging/EPTF_CLL_LoggingCS.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Logging/EPTF_CLL_LoggingCS_Dep.grp b/src/Logging/EPTF_CLL_LoggingCS_Dep.grp
index ebe129a..e268139 100755
--- a/src/Logging/EPTF_CLL_LoggingCS_Dep.grp
+++ b/src/Logging/EPTF_CLL_LoggingCS_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Logging/EPTF_CLL_LoggingClient_Functions.ttcn b/src/Logging/EPTF_CLL_LoggingClient_Functions.ttcn
index 46b88a1..c676380 100644
--- a/src/Logging/EPTF_CLL_LoggingClient_Functions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_LoggingServer_Definitions.ttcn b/src/Logging/EPTF_CLL_LoggingServer_Definitions.ttcn
index d781569..4250c25 100644
--- a/src/Logging/EPTF_CLL_LoggingServer_Definitions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingServer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_LoggingServer_Functions.ttcn b/src/Logging/EPTF_CLL_LoggingServer_Functions.ttcn
index f98ad83..1ad5b4b 100644
--- a/src/Logging/EPTF_CLL_LoggingServer_Functions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingServer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_LoggingUI.grp b/src/Logging/EPTF_CLL_LoggingUI.grp
index f7a3bb9..17f74e7 100644
--- a/src/Logging/EPTF_CLL_LoggingUI.grp
+++ b/src/Logging/EPTF_CLL_LoggingUI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Logging/EPTF_CLL_LoggingUIClient_Functions.ttcn b/src/Logging/EPTF_CLL_LoggingUIClient_Functions.ttcn
index 89cff47..6d1c27a 100644
--- a/src/Logging/EPTF_CLL_LoggingUIClient_Functions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingUIClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp b/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp
index fab18fe..1941381 100755
--- a/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp
+++ b/src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Logging/EPTF_CLL_LoggingUI_Definitions.ttcn b/src/Logging/EPTF_CLL_LoggingUI_Definitions.ttcn
index 1a06f58..5159e2c 100644
--- a/src/Logging/EPTF_CLL_LoggingUI_Definitions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_LoggingUI_Functions.ttcn b/src/Logging/EPTF_CLL_LoggingUI_Functions.ttcn
index 86df025..74a49ae 100644
--- a/src/Logging/EPTF_CLL_LoggingUI_Functions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_LoggingUI_PrivateFunctions.ttcn b/src/Logging/EPTF_CLL_LoggingUI_PrivateFunctions.ttcn
index cff8ec3..a5de8a4 100644
--- a/src/Logging/EPTF_CLL_LoggingUI_PrivateFunctions.ttcn
+++ b/src/Logging/EPTF_CLL_LoggingUI_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_Logging_Client.tpd b/src/Logging/EPTF_CLL_Logging_Client.tpd
index bfe97b7..077bb06 100644
--- a/src/Logging/EPTF_CLL_Logging_Client.tpd
+++ b/src/Logging/EPTF_CLL_Logging_Client.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Logging/EPTF_CLL_Logging_Definitions.ttcn b/src/Logging/EPTF_CLL_Logging_Definitions.ttcn
index 311bf01..e2497db 100644
--- a/src/Logging/EPTF_CLL_Logging_Definitions.ttcn
+++ b/src/Logging/EPTF_CLL_Logging_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_Logging_Dep.grp b/src/Logging/EPTF_CLL_Logging_Dep.grp
index b1cd953..254d06d 100755
--- a/src/Logging/EPTF_CLL_Logging_Dep.grp
+++ b/src/Logging/EPTF_CLL_Logging_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Logging/EPTF_CLL_Logging_Functions.ttcn b/src/Logging/EPTF_CLL_Logging_Functions.ttcn
index 5534d6b..34bc18e 100644
--- a/src/Logging/EPTF_CLL_Logging_Functions.ttcn
+++ b/src/Logging/EPTF_CLL_Logging_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Logging/EPTF_CLL_Logging_Server.tpd b/src/Logging/EPTF_CLL_Logging_Server.tpd
index 1488790..5eb06dc 100644
--- a/src/Logging/EPTF_CLL_Logging_Server.tpd
+++ b/src/Logging/EPTF_CLL_Logging_Server.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Logging/EPTF_CLL_Logging_UI.tpd b/src/Logging/EPTF_CLL_Logging_UI.tpd
index 15b7c47..68a3263 100644
--- a/src/Logging/EPTF_CLL_Logging_UI.tpd
+++ b/src/Logging/EPTF_CLL_Logging_UI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/NQueue/EPTF_CLL_NQueue.grp b/src/NQueue/EPTF_CLL_NQueue.grp
index f6ab89b..77bb5c4 100644
--- a/src/NQueue/EPTF_CLL_NQueue.grp
+++ b/src/NQueue/EPTF_CLL_NQueue.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/NQueue/EPTF_CLL_NQueue.tpd b/src/NQueue/EPTF_CLL_NQueue.tpd
index c6a694a..2fda6d4 100644
--- a/src/NQueue/EPTF_CLL_NQueue.tpd
+++ b/src/NQueue/EPTF_CLL_NQueue.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/NQueue/EPTF_CLL_NQueue_Definitions.ttcn b/src/NQueue/EPTF_CLL_NQueue_Definitions.ttcn
index 48c3863..98ab263 100644
--- a/src/NQueue/EPTF_CLL_NQueue_Definitions.ttcn
+++ b/src/NQueue/EPTF_CLL_NQueue_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/NQueue/EPTF_CLL_NQueue_ExternalFunctions.cc b/src/NQueue/EPTF_CLL_NQueue_ExternalFunctions.cc
index 1f238b7..1e94950 100644
--- a/src/NQueue/EPTF_CLL_NQueue_ExternalFunctions.cc
+++ b/src/NQueue/EPTF_CLL_NQueue_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "EPTF_CLL_Base_Functions.hh"
diff --git a/src/NQueue/EPTF_CLL_NQueue_Functions.ttcn b/src/NQueue/EPTF_CLL_NQueue_Functions.ttcn
index cb77db4..4ffcee8 100644
--- a/src/NQueue/EPTF_CLL_NQueue_Functions.ttcn
+++ b/src/NQueue/EPTF_CLL_NQueue_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/NameService/EPTF_CLL_NameService.grp b/src/NameService/EPTF_CLL_NameService.grp
index 1157bd6..8d8d54c 100644
--- a/src/NameService/EPTF_CLL_NameService.grp
+++ b/src/NameService/EPTF_CLL_NameService.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/NameService/EPTF_CLL_NameService.tpd b/src/NameService/EPTF_CLL_NameService.tpd
index a2dc387..0d1f900 100644
--- a/src/NameService/EPTF_CLL_NameService.tpd
+++ b/src/NameService/EPTF_CLL_NameService.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/NameService/EPTF_CLL_NameServiceClient_Functions.ttcn b/src/NameService/EPTF_CLL_NameServiceClient_Functions.ttcn
index c4f16cd..b02cb0e 100644
--- a/src/NameService/EPTF_CLL_NameServiceClient_Functions.ttcn
+++ b/src/NameService/EPTF_CLL_NameServiceClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/NameService/EPTF_CLL_NameService_Definitions.ttcn b/src/NameService/EPTF_CLL_NameService_Definitions.ttcn
index 797446b..448f275 100644
--- a/src/NameService/EPTF_CLL_NameService_Definitions.ttcn
+++ b/src/NameService/EPTF_CLL_NameService_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/NameService/EPTF_CLL_NameService_Dep.grp b/src/NameService/EPTF_CLL_NameService_Dep.grp
index 68489ce..785cfd8 100755
--- a/src/NameService/EPTF_CLL_NameService_Dep.grp
+++ b/src/NameService/EPTF_CLL_NameService_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/NameService/EPTF_CLL_NameService_ExternalFunctions.cc b/src/NameService/EPTF_CLL_NameService_ExternalFunctions.cc
index a6ac715..d95dec4 100644
--- a/src/NameService/EPTF_CLL_NameService_ExternalFunctions.cc
+++ b/src/NameService/EPTF_CLL_NameService_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include "EPTF_CLL_NameService_Definitions.hh"
diff --git a/src/NameService/EPTF_CLL_NameService_Functions.ttcn b/src/NameService/EPTF_CLL_NameService_Functions.ttcn
index de6b966..e674aa5 100644
--- a/src/NameService/EPTF_CLL_NameService_Functions.ttcn
+++ b/src/NameService/EPTF_CLL_NameService_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/PTCDeployment/EPTF_CLL_PTCDeployment.grp b/src/PTCDeployment/EPTF_CLL_PTCDeployment.grp
index 3faaa27..13cd0d8 100644
--- a/src/PTCDeployment/EPTF_CLL_PTCDeployment.grp
+++ b/src/PTCDeployment/EPTF_CLL_PTCDeployment.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/PTCDeployment/EPTF_CLL_PTCDeployment.tpd b/src/PTCDeployment/EPTF_CLL_PTCDeployment.tpd
index ec5db7e..42004d9 100644
--- a/src/PTCDeployment/EPTF_CLL_PTCDeployment.tpd
+++ b/src/PTCDeployment/EPTF_CLL_PTCDeployment.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/PTCDeployment/EPTF_CLL_PTCDeployment_Definitions.ttcn b/src/PTCDeployment/EPTF_CLL_PTCDeployment_Definitions.ttcn
index 9467067..85a33e0 100644
--- a/src/PTCDeployment/EPTF_CLL_PTCDeployment_Definitions.ttcn
+++ b/src/PTCDeployment/EPTF_CLL_PTCDeployment_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/PTCDeployment/EPTF_CLL_PTCDeployment_Dep.grp b/src/PTCDeployment/EPTF_CLL_PTCDeployment_Dep.grp
index dfeb8cf..7d743a2 100755
--- a/src/PTCDeployment/EPTF_CLL_PTCDeployment_Dep.grp
+++ b/src/PTCDeployment/EPTF_CLL_PTCDeployment_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/PTCDeployment/EPTF_CLL_PTCDeployment_Functions.ttcn b/src/PTCDeployment/EPTF_CLL_PTCDeployment_Functions.ttcn
index bc1d305..95ea071 100644
--- a/src/PTCDeployment/EPTF_CLL_PTCDeployment_Functions.ttcn
+++ b/src/PTCDeployment/EPTF_CLL_PTCDeployment_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/PTCDeployment/EPTF_CLL_PTCDeployment_PrivateFunctions.ttcn b/src/PTCDeployment/EPTF_CLL_PTCDeployment_PrivateFunctions.ttcn
index 0ef62f2..67f90d2 100644
--- a/src/PTCDeployment/EPTF_CLL_PTCDeployment_PrivateFunctions.ttcn
+++ b/src/PTCDeployment/EPTF_CLL_PTCDeployment_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RandomNArray/EPTF_CLL_RNA.grp b/src/RandomNArray/EPTF_CLL_RNA.grp
index 40a6ceb..415fedd 100644
--- a/src/RandomNArray/EPTF_CLL_RNA.grp
+++ b/src/RandomNArray/EPTF_CLL_RNA.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/RandomNArray/EPTF_CLL_RNA_Definitions.ttcn b/src/RandomNArray/EPTF_CLL_RNA_Definitions.ttcn
index 647a695..88d1c98 100644
--- a/src/RandomNArray/EPTF_CLL_RNA_Definitions.ttcn
+++ b/src/RandomNArray/EPTF_CLL_RNA_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RandomNArray/EPTF_CLL_RNA_Functions.ttcn b/src/RandomNArray/EPTF_CLL_RNA_Functions.ttcn
index e7bac63..e3577ff 100644
--- a/src/RandomNArray/EPTF_CLL_RNA_Functions.ttcn
+++ b/src/RandomNArray/EPTF_CLL_RNA_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RandomNArray/EPTF_CLL_RandomNArray.tpd b/src/RandomNArray/EPTF_CLL_RandomNArray.tpd
index c97c533..cd52fb3 100644
--- a/src/RandomNArray/EPTF_CLL_RandomNArray.tpd
+++ b/src/RandomNArray/EPTF_CLL_RandomNArray.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/RandomNArray/EPTF_CLL_RandomNArray_Dep.grp b/src/RandomNArray/EPTF_CLL_RandomNArray_Dep.grp
index 36e88b2..6c1398b 100755
--- a/src/RandomNArray/EPTF_CLL_RandomNArray_Dep.grp
+++ b/src/RandomNArray/EPTF_CLL_RandomNArray_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/RedBlackTree/EPTF_CLL_RBT.grp b/src/RedBlackTree/EPTF_CLL_RBT.grp
index 30e95b5..f559170 100644
--- a/src/RedBlackTree/EPTF_CLL_RBT.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBT.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBT_Definitions.ttcn b/src/RedBlackTree/EPTF_CLL_RBT_Definitions.ttcn
index bf0582e..1d94b29 100644
--- a/src/RedBlackTree/EPTF_CLL_RBT_Definitions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBT_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBT_ExternalFunctions.cc b/src/RedBlackTree/EPTF_CLL_RBT_ExternalFunctions.cc
index 0331338..a6bf77e 100644
--- a/src/RedBlackTree/EPTF_CLL_RBT_ExternalFunctions.cc
+++ b/src/RedBlackTree/EPTF_CLL_RBT_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <math.h> // isgreater, isless
diff --git a/src/RedBlackTree/EPTF_CLL_RBT_Functions.ttcn b/src/RedBlackTree/EPTF_CLL_RBT_Functions.ttcn
index 699c8e8..772238f 100644
--- a/src/RedBlackTree/EPTF_CLL_RBT_Functions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBT_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree.grp b/src/RedBlackTree/EPTF_CLL_RBtree.grp
index 325e442..bb6bb6e 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBtree.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBtreeFloat.grp b/src/RedBlackTree/EPTF_CLL_RBtreeFloat.grp
index b75bb13..41ee507 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtreeFloat.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBtreeFloat.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBtreeFloat_Functions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtreeFloat_Functions.ttcn
index b72a1fc..b459fec 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtreeFloat_Functions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtreeFloat_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtreeFloat_PrivateFunctions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtreeFloat_PrivateFunctions.ttcn
index 646158b..4683273 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtreeFloat_PrivateFunctions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtreeFloat_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtreeInteger.grp b/src/RedBlackTree/EPTF_CLL_RBtreeInteger.grp
index 66a41d4..803e176 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtreeInteger.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBtreeInteger.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBtreeInteger_Functions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtreeInteger_Functions.ttcn
index 2583302..4d7cf45 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtreeInteger_Functions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtreeInteger_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtreeInteger_PrivateFunctions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtreeInteger_PrivateFunctions.ttcn
index b188ac1..de3c101 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtreeInteger_PrivateFunctions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtreeInteger_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree_Definitions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtree_Definitions.ttcn
index fade9bb..de973d4 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree_Definitions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtree_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree_Float.grp b/src/RedBlackTree/EPTF_CLL_RBtree_Float.grp
index 82364b1..642a1d5 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree_Float.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBtree_Float.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree_Functions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtree_Functions.ttcn
index ddc666e..57c5ccf 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree_Functions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtree_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree_General.grp b/src/RedBlackTree/EPTF_CLL_RBtree_General.grp
index 783a374..9c3bad4 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree_General.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBtree_General.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree_Integer.grp b/src/RedBlackTree/EPTF_CLL_RBtree_Integer.grp
index d9ee94e..3a4673d 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree_Integer.grp
+++ b/src/RedBlackTree/EPTF_CLL_RBtree_Integer.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/RedBlackTree/EPTF_CLL_RBtree_PrivateFunctions.ttcn b/src/RedBlackTree/EPTF_CLL_RBtree_PrivateFunctions.ttcn
index 302ee07..d73bd70 100644
--- a/src/RedBlackTree/EPTF_CLL_RBtree_PrivateFunctions.ttcn
+++ b/src/RedBlackTree/EPTF_CLL_RBtree_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RedBlackTree/EPTF_CLL_RedBlackTree.tpd b/src/RedBlackTree/EPTF_CLL_RedBlackTree.tpd
index 4b8d1c0..d4adbec 100644
--- a/src/RedBlackTree/EPTF_CLL_RedBlackTree.tpd
+++ b/src/RedBlackTree/EPTF_CLL_RedBlackTree.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/RedBlackTree/EPTF_CLL_RedBlackTree_Dep.grp b/src/RedBlackTree/EPTF_CLL_RedBlackTree_Dep.grp
index 731fcc3..890c7d7 100755
--- a/src/RedBlackTree/EPTF_CLL_RedBlackTree_Dep.grp
+++ b/src/RedBlackTree/EPTF_CLL_RedBlackTree_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Rendezvous/EPTF_CLL_Rendezvous.grp b/src/Rendezvous/EPTF_CLL_Rendezvous.grp
index ca574ba..83ca94d 100644
--- a/src/Rendezvous/EPTF_CLL_Rendezvous.grp
+++ b/src/Rendezvous/EPTF_CLL_Rendezvous.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Rendezvous/EPTF_CLL_Rendezvous.tpd b/src/Rendezvous/EPTF_CLL_Rendezvous.tpd
index d0070dd..d5470ba 100644
--- a/src/Rendezvous/EPTF_CLL_Rendezvous.tpd
+++ b/src/Rendezvous/EPTF_CLL_Rendezvous.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Rendezvous/EPTF_CLL_RendezvousClient_Functions.ttcn b/src/Rendezvous/EPTF_CLL_RendezvousClient_Functions.ttcn
index 712b536..4b38827 100644
--- a/src/Rendezvous/EPTF_CLL_RendezvousClient_Functions.ttcn
+++ b/src/Rendezvous/EPTF_CLL_RendezvousClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Rendezvous/EPTF_CLL_Rendezvous_Definitions.ttcn b/src/Rendezvous/EPTF_CLL_Rendezvous_Definitions.ttcn
index 4e0ffe4..445cafb 100644
--- a/src/Rendezvous/EPTF_CLL_Rendezvous_Definitions.ttcn
+++ b/src/Rendezvous/EPTF_CLL_Rendezvous_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Rendezvous/EPTF_CLL_Rendezvous_Dep.grp b/src/Rendezvous/EPTF_CLL_Rendezvous_Dep.grp
index a8a29d4..026c971 100755
--- a/src/Rendezvous/EPTF_CLL_Rendezvous_Dep.grp
+++ b/src/Rendezvous/EPTF_CLL_Rendezvous_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Rendezvous/EPTF_CLL_Rendezvous_Functions.ttcn b/src/Rendezvous/EPTF_CLL_Rendezvous_Functions.ttcn
index fb56471..ce780c8 100644
--- a/src/Rendezvous/EPTF_CLL_Rendezvous_Functions.ttcn
+++ b/src/Rendezvous/EPTF_CLL_Rendezvous_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Definitions.ttcnin b/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Definitions.ttcnin
index 4e82210..fbcdf39 100644
--- a/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Definitions.ttcnin
+++ b/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Definitions.ttcnin
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Functions.ttcnin b/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Functions.ttcnin
index e62eb73..2d063ac 100644
--- a/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Functions.ttcnin
+++ b/src/RingBuffer/EPTF_CLL_GenericRingBuffer_Functions.ttcnin
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/RingBuffer/EPTF_CLL_IntegerRingBuffer_Functions.ttcn b/src/RingBuffer/EPTF_CLL_IntegerRingBuffer_Functions.ttcn
index 76a6c18..804625e 100644
--- a/src/RingBuffer/EPTF_CLL_IntegerRingBuffer_Functions.ttcn
+++ b/src/RingBuffer/EPTF_CLL_IntegerRingBuffer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/RingBuffer/EPTF_CLL_RingBuffer.grp b/src/RingBuffer/EPTF_CLL_RingBuffer.grp
index a80ea03..c92e4f6 100644
--- a/src/RingBuffer/EPTF_CLL_RingBuffer.grp
+++ b/src/RingBuffer/EPTF_CLL_RingBuffer.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 //                                                                           //

 ///////////////////////////////////////////////////////////////////////////////

 -->

diff --git a/src/RingBuffer/EPTF_CLL_RingBuffer.tpd b/src/RingBuffer/EPTF_CLL_RingBuffer.tpd
index 8141517..fdf8e16 100644
--- a/src/RingBuffer/EPTF_CLL_RingBuffer.tpd
+++ b/src/RingBuffer/EPTF_CLL_RingBuffer.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/RingBuffer/EPTF_CLL_RingBuffer_Definitions.ttcn b/src/RingBuffer/EPTF_CLL_RingBuffer_Definitions.ttcn
index 44bc23e..be2581f 100644
--- a/src/RingBuffer/EPTF_CLL_RingBuffer_Definitions.ttcn
+++ b/src/RingBuffer/EPTF_CLL_RingBuffer_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/RingBuffer/EPTF_CLL_RingBuffer_Dep.grp b/src/RingBuffer/EPTF_CLL_RingBuffer_Dep.grp
index 31cdbff..d3a8146 100755
--- a/src/RingBuffer/EPTF_CLL_RingBuffer_Dep.grp
+++ b/src/RingBuffer/EPTF_CLL_RingBuffer_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/RingBuffer/EPTF_CLL_RingBuffer_PrivateFunctions.ttcn b/src/RingBuffer/EPTF_CLL_RingBuffer_PrivateFunctions.ttcn
index 38928f9..527fa29 100644
--- a/src/RingBuffer/EPTF_CLL_RingBuffer_PrivateFunctions.ttcn
+++ b/src/RingBuffer/EPTF_CLL_RingBuffer_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/SMacro/EPTF_CLL_SMacro.grp b/src/SMacro/EPTF_CLL_SMacro.grp
index 58c1417..363e434 100644
--- a/src/SMacro/EPTF_CLL_SMacro.grp
+++ b/src/SMacro/EPTF_CLL_SMacro.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/SMacro/EPTF_CLL_SMacro.tpd b/src/SMacro/EPTF_CLL_SMacro.tpd
index 348d5d2..f2b11c9 100644
--- a/src/SMacro/EPTF_CLL_SMacro.tpd
+++ b/src/SMacro/EPTF_CLL_SMacro.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/SMacro/EPTF_CLL_SMacro_Definitions.ttcn b/src/SMacro/EPTF_CLL_SMacro_Definitions.ttcn
index 7297b20..ec33e14 100644
--- a/src/SMacro/EPTF_CLL_SMacro_Definitions.ttcn
+++ b/src/SMacro/EPTF_CLL_SMacro_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/SMacro/EPTF_CLL_SMacro_Dep.grp b/src/SMacro/EPTF_CLL_SMacro_Dep.grp
index bd5e7cd..39d3f1b 100755
--- a/src/SMacro/EPTF_CLL_SMacro_Dep.grp
+++ b/src/SMacro/EPTF_CLL_SMacro_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/SMacro/EPTF_CLL_SMacro_ExternalFunctions.cc b/src/SMacro/EPTF_CLL_SMacro_ExternalFunctions.cc
index d081ee8..e29bcab 100644
--- a/src/SMacro/EPTF_CLL_SMacro_ExternalFunctions.cc
+++ b/src/SMacro/EPTF_CLL_SMacro_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/SMacro/EPTF_CLL_SMacro_Functions.ttcn b/src/SMacro/EPTF_CLL_SMacro_Functions.ttcn
index 5a74139..58e114c 100644
--- a/src/SMacro/EPTF_CLL_SMacro_Functions.ttcn
+++ b/src/SMacro/EPTF_CLL_SMacro_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Scheduler/EPTF_CLL_RBTScheduler_Definitions.ttcn b/src/Scheduler/EPTF_CLL_RBTScheduler_Definitions.ttcn
index dfb3637..f47f016 100644
--- a/src/Scheduler/EPTF_CLL_RBTScheduler_Definitions.ttcn
+++ b/src/Scheduler/EPTF_CLL_RBTScheduler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Scheduler/EPTF_CLL_RBTScheduler_Functions.ttcn b/src/Scheduler/EPTF_CLL_RBTScheduler_Functions.ttcn
index b707c19..54e836b 100644
--- a/src/Scheduler/EPTF_CLL_RBTScheduler_Functions.ttcn
+++ b/src/Scheduler/EPTF_CLL_RBTScheduler_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Scheduler/EPTF_CLL_Scheduler.grp b/src/Scheduler/EPTF_CLL_Scheduler.grp
index 58c6a1e..e7bf25e 100644
--- a/src/Scheduler/EPTF_CLL_Scheduler.grp
+++ b/src/Scheduler/EPTF_CLL_Scheduler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Scheduler/EPTF_CLL_Scheduler.tpd b/src/Scheduler/EPTF_CLL_Scheduler.tpd
index 7fdf177..87e3e11 100644
--- a/src/Scheduler/EPTF_CLL_Scheduler.tpd
+++ b/src/Scheduler/EPTF_CLL_Scheduler.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Scheduler/EPTF_CLL_Scheduler_Definitions.ttcn b/src/Scheduler/EPTF_CLL_Scheduler_Definitions.ttcn
index db47a69..fb049dc 100644
--- a/src/Scheduler/EPTF_CLL_Scheduler_Definitions.ttcn
+++ b/src/Scheduler/EPTF_CLL_Scheduler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Scheduler/EPTF_CLL_Scheduler_Dep.grp b/src/Scheduler/EPTF_CLL_Scheduler_Dep.grp
index 7edc1b4..9291154 100755
--- a/src/Scheduler/EPTF_CLL_Scheduler_Dep.grp
+++ b/src/Scheduler/EPTF_CLL_Scheduler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Scheduler/EPTF_CLL_Scheduler_FBQ.grp b/src/Scheduler/EPTF_CLL_Scheduler_FBQ.grp
index b260daa..7572bff 100644
--- a/src/Scheduler/EPTF_CLL_Scheduler_FBQ.grp
+++ b/src/Scheduler/EPTF_CLL_Scheduler_FBQ.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Scheduler/EPTF_CLL_Scheduler_General.grp b/src/Scheduler/EPTF_CLL_Scheduler_General.grp
index 0d068d3..b5aa025 100644
--- a/src/Scheduler/EPTF_CLL_Scheduler_General.grp
+++ b/src/Scheduler/EPTF_CLL_Scheduler_General.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Scheduler/EPTF_CLL_Scheduler_RBT.grp b/src/Scheduler/EPTF_CLL_Scheduler_RBT.grp
index cc7e742..3870642 100644
--- a/src/Scheduler/EPTF_CLL_Scheduler_RBT.grp
+++ b/src/Scheduler/EPTF_CLL_Scheduler_RBT.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Scheduler/EPTF_FBQScheduler.grp b/src/Scheduler/EPTF_FBQScheduler.grp
index 8710347..9f38711 100644
--- a/src/Scheduler/EPTF_FBQScheduler.grp
+++ b/src/Scheduler/EPTF_FBQScheduler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Scheduler/EPTF_RBTScheduler.grp b/src/Scheduler/EPTF_RBTScheduler.grp
index 108149a..2df0096 100644
--- a/src/Scheduler/EPTF_RBTScheduler.grp
+++ b/src/Scheduler/EPTF_RBTScheduler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Semaphore/EPTF_CLL_Semaphore.grp b/src/Semaphore/EPTF_CLL_Semaphore.grp
index 464267a..37ca12d 100644
--- a/src/Semaphore/EPTF_CLL_Semaphore.grp
+++ b/src/Semaphore/EPTF_CLL_Semaphore.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Semaphore/EPTF_CLL_Semaphore.tpd b/src/Semaphore/EPTF_CLL_Semaphore.tpd
index 55c7384..8d5edd0 100644
--- a/src/Semaphore/EPTF_CLL_Semaphore.tpd
+++ b/src/Semaphore/EPTF_CLL_Semaphore.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Semaphore/EPTF_CLL_Semaphore_Definitions.ttcn b/src/Semaphore/EPTF_CLL_Semaphore_Definitions.ttcn
index 4992993..549303f 100644
--- a/src/Semaphore/EPTF_CLL_Semaphore_Definitions.ttcn
+++ b/src/Semaphore/EPTF_CLL_Semaphore_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Semaphore/EPTF_CLL_Semaphore_Dep.grp b/src/Semaphore/EPTF_CLL_Semaphore_Dep.grp
index c9ceee8..7e741a9 100755
--- a/src/Semaphore/EPTF_CLL_Semaphore_Dep.grp
+++ b/src/Semaphore/EPTF_CLL_Semaphore_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Semaphore/EPTF_CLL_Semaphore_Functions.ttcn b/src/Semaphore/EPTF_CLL_Semaphore_Functions.ttcn
index 6b8a8e9..b466c66 100644
--- a/src/Semaphore/EPTF_CLL_Semaphore_Functions.ttcn
+++ b/src/Semaphore/EPTF_CLL_Semaphore_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatCapture/EPTF_CLL_StatCapture.grp b/src/StatCapture/EPTF_CLL_StatCapture.grp
index 1b7a32a..0e37123 100644
--- a/src/StatCapture/EPTF_CLL_StatCapture.grp
+++ b/src/StatCapture/EPTF_CLL_StatCapture.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatCapture/EPTF_CLL_StatCapture.tpd b/src/StatCapture/EPTF_CLL_StatCapture.tpd
index 8c001e0..b22a633 100644
--- a/src/StatCapture/EPTF_CLL_StatCapture.tpd
+++ b/src/StatCapture/EPTF_CLL_StatCapture.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureControl.grp b/src/StatCapture/EPTF_CLL_StatCaptureControl.grp
index 353aff7..6da2d23 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureControl.grp
+++ b/src/StatCapture/EPTF_CLL_StatCaptureControl.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureControl.tpd b/src/StatCapture/EPTF_CLL_StatCaptureControl.tpd
index aece767..6e0c8de 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureControl.tpd
+++ b/src/StatCapture/EPTF_CLL_StatCaptureControl.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureControl_Definitions.ttcn b/src/StatCapture/EPTF_CLL_StatCaptureControl_Definitions.ttcn
index 2dcda2b..fe86f35 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureControl_Definitions.ttcn
+++ b/src/StatCapture/EPTF_CLL_StatCaptureControl_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureControl_Functions.ttcn b/src/StatCapture/EPTF_CLL_StatCaptureControl_Functions.ttcn
index 86bb821..ea16795 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureControl_Functions.ttcn
+++ b/src/StatCapture/EPTF_CLL_StatCaptureControl_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureUI.grp b/src/StatCapture/EPTF_CLL_StatCaptureUI.grp
index 58a8a57..8f74d90 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureUI.grp
+++ b/src/StatCapture/EPTF_CLL_StatCaptureUI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureUI.tpd b/src/StatCapture/EPTF_CLL_StatCaptureUI.tpd
index cb80f3c..7c33f9c 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureUI.tpd
+++ b/src/StatCapture/EPTF_CLL_StatCaptureUI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureUIHandler_Dep.grp b/src/StatCapture/EPTF_CLL_StatCaptureUIHandler_Dep.grp
index caf0de1..f4bdcde 100755
--- a/src/StatCapture/EPTF_CLL_StatCaptureUIHandler_Dep.grp
+++ b/src/StatCapture/EPTF_CLL_StatCaptureUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureUI_Definitions.ttcn b/src/StatCapture/EPTF_CLL_StatCaptureUI_Definitions.ttcn
index 52d77b3..50e8241 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureUI_Definitions.ttcn
+++ b/src/StatCapture/EPTF_CLL_StatCaptureUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatCapture/EPTF_CLL_StatCaptureUI_Functions.ttcn b/src/StatCapture/EPTF_CLL_StatCaptureUI_Functions.ttcn
index 0c381dc..aa09727 100644
--- a/src/StatCapture/EPTF_CLL_StatCaptureUI_Functions.ttcn
+++ b/src/StatCapture/EPTF_CLL_StatCaptureUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatCapture/EPTF_CLL_StatCapture_Definitions.ttcn b/src/StatCapture/EPTF_CLL_StatCapture_Definitions.ttcn
index 66fb320..756dc67 100644
--- a/src/StatCapture/EPTF_CLL_StatCapture_Definitions.ttcn
+++ b/src/StatCapture/EPTF_CLL_StatCapture_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatCapture/EPTF_CLL_StatCapture_Dep.grp b/src/StatCapture/EPTF_CLL_StatCapture_Dep.grp
index 98281af..2aff1be 100755
--- a/src/StatCapture/EPTF_CLL_StatCapture_Dep.grp
+++ b/src/StatCapture/EPTF_CLL_StatCapture_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatCapture/EPTF_CLL_StatCapture_ExternalFunctions.cc b/src/StatCapture/EPTF_CLL_StatCapture_ExternalFunctions.cc
index ef5f511..68566fe 100644
--- a/src/StatCapture/EPTF_CLL_StatCapture_ExternalFunctions.cc
+++ b/src/StatCapture/EPTF_CLL_StatCapture_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatCapture/EPTF_CLL_StatCapture_Functions.ttcn b/src/StatCapture/EPTF_CLL_StatCapture_Functions.ttcn
index 1603b12..6821701 100644
--- a/src/StatCapture/EPTF_CLL_StatCapture_Functions.ttcn
+++ b/src/StatCapture/EPTF_CLL_StatCapture_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandler.grp b/src/StatHandler/EPTF_CLL_StatHandler.grp
index 86adc76..be4c029 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler.grp
+++ b/src/StatHandler/EPTF_CLL_StatHandler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatHandler/EPTF_CLL_StatHandler.tpd b/src/StatHandler/EPTF_CLL_StatHandler.tpd
index 4697fd7..a4c260c 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler.tpd
+++ b/src/StatHandler/EPTF_CLL_StatHandler.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerClient_Definitions.ttcn b/src/StatHandler/EPTF_CLL_StatHandlerClient_Definitions.ttcn
index 9349d53..cc4f4e6 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerClient_Definitions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandlerClient_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerClient_Functions.ttcn b/src/StatHandler/EPTF_CLL_StatHandlerClient_Functions.ttcn
index fa2e0d0..813abf5 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerClient_Functions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandlerClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerLogging_Definitions.ttcn b/src/StatHandler/EPTF_CLL_StatHandlerLogging_Definitions.ttcn
index 0096e7e..9177af9 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerLogging_Definitions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandlerLogging_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerLogging_Functions.ttcn b/src/StatHandler/EPTF_CLL_StatHandlerLogging_Functions.ttcn
index 93f599c..baa6a6e 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerLogging_Functions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandlerLogging_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerUI.grp b/src/StatHandler/EPTF_CLL_StatHandlerUI.grp
index 776c725..9700997 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerUI.grp
+++ b/src/StatHandler/EPTF_CLL_StatHandlerUI.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerUIHandler_Dep.grp b/src/StatHandler/EPTF_CLL_StatHandlerUIHandler_Dep.grp
index 0771c42..610575e 100755
--- a/src/StatHandler/EPTF_CLL_StatHandlerUIHandler_Dep.grp
+++ b/src/StatHandler/EPTF_CLL_StatHandlerUIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/StatHandler/EPTF_CLL_StatHandlerUI_Definitions.ttcn b/src/StatHandler/EPTF_CLL_StatHandlerUI_Definitions.ttcn
index 1325742..3538635 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerUI_Definitions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandlerUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandlerUI_Functions.ttcn b/src/StatHandler/EPTF_CLL_StatHandlerUI_Functions.ttcn
index dc345fc..1c49078 100644
--- a/src/StatHandler/EPTF_CLL_StatHandlerUI_Functions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandlerUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandler_DSFunctions.ttcn b/src/StatHandler/EPTF_CLL_StatHandler_DSFunctions.ttcn
index 5232753..ba5ad9e 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler_DSFunctions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandler_DSFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandler_Definitions.ttcn b/src/StatHandler/EPTF_CLL_StatHandler_Definitions.ttcn
index 6ddb997..6e02d39 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler_Definitions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandler_Dep.grp b/src/StatHandler/EPTF_CLL_StatHandler_Dep.grp
index 325e2a5..4269029 100755
--- a/src/StatHandler/EPTF_CLL_StatHandler_Dep.grp
+++ b/src/StatHandler/EPTF_CLL_StatHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatHandler/EPTF_CLL_StatHandler_ExternalFunctions.cc b/src/StatHandler/EPTF_CLL_StatHandler_ExternalFunctions.cc
index 0e3e705..17e8904 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler_ExternalFunctions.cc
+++ b/src/StatHandler/EPTF_CLL_StatHandler_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatHandler/EPTF_CLL_StatHandler_Functions.ttcn b/src/StatHandler/EPTF_CLL_StatHandler_Functions.ttcn
index b0be1b7..4a2c132 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler_Functions.ttcn
+++ b/src/StatHandler/EPTF_CLL_StatHandler_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/StatHandler/EPTF_CLL_StatHandler_UI.tpd b/src/StatHandler/EPTF_CLL_StatHandler_UI.tpd
index 53ab14c..f8441a9 100644
--- a/src/StatHandler/EPTF_CLL_StatHandler_UI.tpd
+++ b/src/StatHandler/EPTF_CLL_StatHandler_UI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatManager/EPTF_CLL_StatManager.grp b/src/StatManager/EPTF_CLL_StatManager.grp
index 22e519e..03bffbd 100644
--- a/src/StatManager/EPTF_CLL_StatManager.grp
+++ b/src/StatManager/EPTF_CLL_StatManager.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatManager/EPTF_CLL_StatManager.tpd b/src/StatManager/EPTF_CLL_StatManager.tpd
index 4261a11..3019a2e 100644
--- a/src/StatManager/EPTF_CLL_StatManager.tpd
+++ b/src/StatManager/EPTF_CLL_StatManager.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatManager/EPTF_CLL_StatManager_Definitions.ttcn b/src/StatManager/EPTF_CLL_StatManager_Definitions.ttcn
index b42a476..690a40a 100644
--- a/src/StatManager/EPTF_CLL_StatManager_Definitions.ttcn
+++ b/src/StatManager/EPTF_CLL_StatManager_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/StatManager/EPTF_CLL_StatManager_Dep.grp b/src/StatManager/EPTF_CLL_StatManager_Dep.grp
index 8199c99..7d99bef 100755
--- a/src/StatManager/EPTF_CLL_StatManager_Dep.grp
+++ b/src/StatManager/EPTF_CLL_StatManager_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn b/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn
index 11e47d1..dc7547e 100644
--- a/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn
+++ b/src/StatManager/EPTF_CLL_StatManager_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/StatMeasure/EPTF_CLL_StatMeasure.grp b/src/StatMeasure/EPTF_CLL_StatMeasure.grp
index ac3340a..2147352 100644
--- a/src/StatMeasure/EPTF_CLL_StatMeasure.grp
+++ b/src/StatMeasure/EPTF_CLL_StatMeasure.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatMeasure/EPTF_CLL_StatMeasure.tpd b/src/StatMeasure/EPTF_CLL_StatMeasure.tpd
index d648836..4b99482 100644
--- a/src/StatMeasure/EPTF_CLL_StatMeasure.tpd
+++ b/src/StatMeasure/EPTF_CLL_StatMeasure.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatMeasure/EPTF_CLL_StatMeasure_Definitions.ttcn b/src/StatMeasure/EPTF_CLL_StatMeasure_Definitions.ttcn
index 7d81e2a..2929bb6 100644
--- a/src/StatMeasure/EPTF_CLL_StatMeasure_Definitions.ttcn
+++ b/src/StatMeasure/EPTF_CLL_StatMeasure_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/StatMeasure/EPTF_CLL_StatMeasure_Dep.grp b/src/StatMeasure/EPTF_CLL_StatMeasure_Dep.grp
index 8412ced..c9c3ff7 100755
--- a/src/StatMeasure/EPTF_CLL_StatMeasure_Dep.grp
+++ b/src/StatMeasure/EPTF_CLL_StatMeasure_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/StatMeasure/EPTF_CLL_StatMeasure_Functions.ttcn b/src/StatMeasure/EPTF_CLL_StatMeasure_Functions.ttcn
index 13cf99c..29f31eb 100644
--- a/src/StatMeasure/EPTF_CLL_StatMeasure_Functions.ttcn
+++ b/src/StatMeasure/EPTF_CLL_StatMeasure_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/StatMeasure/UsefulFunctions.grp b/src/StatMeasure/UsefulFunctions.grp
index 86cbb3d..0161039 100755
--- a/src/StatMeasure/UsefulFunctions.grp
+++ b/src/StatMeasure/UsefulFunctions.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/StatReplay/EPTF_CLL_StatReplay.grp b/src/StatReplay/EPTF_CLL_StatReplay.grp
index edca223..4dd8b6d 100644
--- a/src/StatReplay/EPTF_CLL_StatReplay.grp
+++ b/src/StatReplay/EPTF_CLL_StatReplay.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/StatReplay/EPTF_CLL_StatReplay.tpd b/src/StatReplay/EPTF_CLL_StatReplay.tpd
index dcc1912..86cda97 100644
--- a/src/StatReplay/EPTF_CLL_StatReplay.tpd
+++ b/src/StatReplay/EPTF_CLL_StatReplay.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/StatReplay/EPTF_CLL_StatReplay_Definitions.ttcnpp b/src/StatReplay/EPTF_CLL_StatReplay_Definitions.ttcnpp
index 7fa4cf4..f163943 100644
--- a/src/StatReplay/EPTF_CLL_StatReplay_Definitions.ttcnpp
+++ b/src/StatReplay/EPTF_CLL_StatReplay_Definitions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/StatReplay/EPTF_CLL_StatReplay_Dep.grp b/src/StatReplay/EPTF_CLL_StatReplay_Dep.grp
index 9221037..e730f5b 100755
--- a/src/StatReplay/EPTF_CLL_StatReplay_Dep.grp
+++ b/src/StatReplay/EPTF_CLL_StatReplay_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/StatReplay/EPTF_CLL_StatReplay_Execution.ttcn b/src/StatReplay/EPTF_CLL_StatReplay_Execution.ttcn
index 436e5cb..5801248 100644
--- a/src/StatReplay/EPTF_CLL_StatReplay_Execution.ttcn
+++ b/src/StatReplay/EPTF_CLL_StatReplay_Execution.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/StatReplay/EPTF_CLL_StatReplay_Functions.ttcn b/src/StatReplay/EPTF_CLL_StatReplay_Functions.ttcn
index 7b12794..c68bc30 100644
--- a/src/StatReplay/EPTF_CLL_StatReplay_Functions.ttcn
+++ b/src/StatReplay/EPTF_CLL_StatReplay_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.grp b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.grp
index 1f7caef..76f2813 100644
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.grp
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.tpd b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.tpd
index 215e277..53b0215 100644
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.tpd
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.ttcn b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.ttcn
index f87c282..021cda7 100644
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.ttcn
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Definitions.ttcn b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Definitions.ttcn
index bc8f007..5a810c8 100644
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Definitions.ttcn
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Dep.grp b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Dep.grp
index 77d16f3..3afda3e 100755
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Dep.grp
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Functions.ttcn b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Functions.ttcn
index 67b67cb..49de84d 100644
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Functions.ttcn
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_XTDPTemplates.ttcn b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_XTDPTemplates.ttcn
index f13e960..a0987bd 100644
--- a/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_XTDPTemplates.ttcn
+++ b/src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_XTDPTemplates.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport.grp b/src/Transport/EPTF_CLL_Transport.grp
index 5078a41..a644f55 100644
--- a/src/Transport/EPTF_CLL_Transport.grp
+++ b/src/Transport/EPTF_CLL_Transport.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_Transport.tpd b/src/Transport/EPTF_CLL_Transport.tpd
index e2b048c..2d40017 100644
--- a/src/Transport/EPTF_CLL_Transport.tpd
+++ b/src/Transport/EPTF_CLL_Transport.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_TransportCommPortIPL4.grp b/src/Transport/EPTF_CLL_TransportCommPortIPL4.grp
index 437d642..fc43500 100644
--- a/src/Transport/EPTF_CLL_TransportCommPortIPL4.grp
+++ b/src/Transport/EPTF_CLL_TransportCommPortIPL4.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_TransportCommPortIPL4_Definitions.ttcn b/src/Transport/EPTF_CLL_TransportCommPortIPL4_Definitions.ttcn
index 6e1cdff..407f3fe 100644
--- a/src/Transport/EPTF_CLL_TransportCommPortIPL4_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportCommPortIPL4_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportCommPortIPL4_Functions.ttcn b/src/Transport/EPTF_CLL_TransportCommPortIPL4_Functions.ttcn
index 831ead0..e8b57e4 100644
--- a/src/Transport/EPTF_CLL_TransportCommPortIPL4_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportCommPortIPL4_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportIPL2.grp b/src/Transport/EPTF_CLL_TransportIPL2.grp
index 566288b..fc4a3c8 100644
--- a/src/Transport/EPTF_CLL_TransportIPL2.grp
+++ b/src/Transport/EPTF_CLL_TransportIPL2.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_TransportIPL2_Definitions.ttcn b/src/Transport/EPTF_CLL_TransportIPL2_Definitions.ttcn
index 13a70aa..dbdf881 100644
--- a/src/Transport/EPTF_CLL_TransportIPL2_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportIPL2_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportIPL2_ExternalFunctions.cc b/src/Transport/EPTF_CLL_TransportIPL2_ExternalFunctions.cc
index e640126..b418c32 100644
--- a/src/Transport/EPTF_CLL_TransportIPL2_ExternalFunctions.cc
+++ b/src/Transport/EPTF_CLL_TransportIPL2_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include <string.h>
diff --git a/src/Transport/EPTF_CLL_TransportIPL2_Functions.ttcn b/src/Transport/EPTF_CLL_TransportIPL2_Functions.ttcn
index 7950fe4..fd1b537 100644
--- a/src/Transport/EPTF_CLL_TransportIPL2_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportIPL2_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportIPL4.grp b/src/Transport/EPTF_CLL_TransportIPL4.grp
index 99634ae..9e33fe3 100644
--- a/src/Transport/EPTF_CLL_TransportIPL4.grp
+++ b/src/Transport/EPTF_CLL_TransportIPL4.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_TransportIPL4_Definitions.ttcn b/src/Transport/EPTF_CLL_TransportIPL4_Definitions.ttcn
index a416ee4..9585688 100644
--- a/src/Transport/EPTF_CLL_TransportIPL4_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportIPL4_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/Transport/EPTF_CLL_TransportIPL4_Functions.ttcn b/src/Transport/EPTF_CLL_TransportIPL4_Functions.ttcn
index d0d17ec..7816405 100644
--- a/src/Transport/EPTF_CLL_TransportIPL4_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportIPL4_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/Transport/EPTF_CLL_TransportIPsecHandler.grp b/src/Transport/EPTF_CLL_TransportIPsecHandler.grp
index bfd976d..942b2b7 100644
--- a/src/Transport/EPTF_CLL_TransportIPsecHandler.grp
+++ b/src/Transport/EPTF_CLL_TransportIPsecHandler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_TransportMessageBufferManager.grp b/src/Transport/EPTF_CLL_TransportMessageBufferManager.grp
index 4646aee..4e5493e 100644
--- a/src/Transport/EPTF_CLL_TransportMessageBufferManager.grp
+++ b/src/Transport/EPTF_CLL_TransportMessageBufferManager.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_TransportMessageBufferManager_Definitions.ttcn b/src/Transport/EPTF_CLL_TransportMessageBufferManager_Definitions.ttcn
index 27c8145..1e772f4 100644
--- a/src/Transport/EPTF_CLL_TransportMessageBufferManager_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportMessageBufferManager_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportMessageBufferManager_Functions.ttcn b/src/Transport/EPTF_CLL_TransportMessageBufferManager_Functions.ttcn
index 01b2fbf..10ac1b7 100644
--- a/src/Transport/EPTF_CLL_TransportMessageBufferManager_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportMessageBufferManager_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportRouting.grp b/src/Transport/EPTF_CLL_TransportRouting.grp
index 131c2ee..4c24faf 100644
--- a/src/Transport/EPTF_CLL_TransportRouting.grp
+++ b/src/Transport/EPTF_CLL_TransportRouting.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_TransportRouting.tpd b/src/Transport/EPTF_CLL_TransportRouting.tpd
index 7b5d889..8911d36 100644
--- a/src/Transport/EPTF_CLL_TransportRouting.tpd
+++ b/src/Transport/EPTF_CLL_TransportRouting.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_TransportRouting_Definitions.ttcn b/src/Transport/EPTF_CLL_TransportRouting_Definitions.ttcn
index 4dc1712..5862228 100644
--- a/src/Transport/EPTF_CLL_TransportRouting_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportRouting_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_TransportRouting_Functions.ttcn b/src/Transport/EPTF_CLL_TransportRouting_Functions.ttcn
index f0df3fb..ae0ee1b 100644
--- a/src/Transport/EPTF_CLL_TransportRouting_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_TransportRouting_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_CommPortIPL4.tpd b/src/Transport/EPTF_CLL_Transport_CommPortIPL4.tpd
index 3d5406e..f61ce5a 100644
--- a/src/Transport/EPTF_CLL_Transport_CommPortIPL4.tpd
+++ b/src/Transport/EPTF_CLL_Transport_CommPortIPL4.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_Transport_Common.grp b/src/Transport/EPTF_CLL_Transport_Common.grp
index 36e9ca4..e845f3e 100644
--- a/src/Transport/EPTF_CLL_Transport_Common.grp
+++ b/src/Transport/EPTF_CLL_Transport_Common.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/Transport/EPTF_CLL_Transport_Common.tpd b/src/Transport/EPTF_CLL_Transport_Common.tpd
index b4be9c6..2ba6c9b 100644
--- a/src/Transport/EPTF_CLL_Transport_Common.tpd
+++ b/src/Transport/EPTF_CLL_Transport_Common.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_Transport_CommonDefinitions.ttcn b/src/Transport/EPTF_CLL_Transport_CommonDefinitions.ttcn
index cdd0248..772b047 100644
--- a/src/Transport/EPTF_CLL_Transport_CommonDefinitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_CommonDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_Definitions.ttcn b/src/Transport/EPTF_CLL_Transport_Definitions.ttcn
index f23fea7..563a591 100644
--- a/src/Transport/EPTF_CLL_Transport_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_Dep.grp b/src/Transport/EPTF_CLL_Transport_Dep.grp
index dfea0b2..01ef74d 100755
--- a/src/Transport/EPTF_CLL_Transport_Dep.grp
+++ b/src/Transport/EPTF_CLL_Transport_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/Transport/EPTF_CLL_Transport_Functions.ttcn b/src/Transport/EPTF_CLL_Transport_Functions.ttcn
index e2f6236..da22def 100644
--- a/src/Transport/EPTF_CLL_Transport_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/Transport/EPTF_CLL_Transport_IPL2.tpd b/src/Transport/EPTF_CLL_Transport_IPL2.tpd
index 1cd61cf..c52ca56 100644
--- a/src/Transport/EPTF_CLL_Transport_IPL2.tpd
+++ b/src/Transport/EPTF_CLL_Transport_IPL2.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_Transport_IPL4.tpd b/src/Transport/EPTF_CLL_Transport_IPL4.tpd
index 1ac9006..79f81fd 100644
--- a/src/Transport/EPTF_CLL_Transport_IPL4.tpd
+++ b/src/Transport/EPTF_CLL_Transport_IPL4.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler.tpd b/src/Transport/EPTF_CLL_Transport_IPsecHandler.tpd
index 1cac3ea..a95a70c 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler.tpd
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Definitions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Definitions.ttcn
index e180041..2936f92 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Functions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Functions.ttcn
index 7ea4772..1535226 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Definitions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Definitions.ttcn
index 263e739..c8954a7 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Functions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Functions.ttcn
index 65718a0..c6e062a 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Client_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_CommonDefinitions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_CommonDefinitions.ttcn
index c7803ae..d815f6f 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_CommonDefinitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_CommonDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Definitions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Definitions.ttcn
index 6c8dcec..e17aacc 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Functions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Functions.ttcn
index e9b95b6..276811a 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Definitions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Definitions.ttcn
index 76a03be..dc04715 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Definitions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Functions.ttcn b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Functions.ttcn
index 0159543..c1a7730 100644
--- a/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Functions.ttcn
+++ b/src/Transport/EPTF_CLL_Transport_IPsecHandler_Logging_Server_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Transport/EPTF_CLL_Transport_MessageBufferManager.tpd b/src/Transport/EPTF_CLL_Transport_MessageBufferManager.tpd
index 6bb7c5b..cd16d8c 100644
--- a/src/Transport/EPTF_CLL_Transport_MessageBufferManager.tpd
+++ b/src/Transport/EPTF_CLL_Transport_MessageBufferManager.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/UIHandler/EPTF_CLL_UIHandler.grp b/src/UIHandler/EPTF_CLL_UIHandler.grp
index 30e6822..de2d6fd 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/UIHandler/EPTF_CLL_UIHandler.tpd b/src/UIHandler/EPTF_CLL_UIHandler.tpd
index 1c635a3..1385fa3 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler.tpd
+++ b/src/UIHandler/EPTF_CLL_UIHandler.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerCLI_CommandDefinitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerCLI_CommandDefinitions.ttcn
index d44b8e1..c1d7276 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerCLI_CommandDefinitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerCLI_CommandDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerCLI_Definitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerCLI_Definitions.ttcn
index b735a4f..1ebe6c2 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerCLI_Definitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerCLI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerCLI_Functions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerCLI_Functions.ttcn
index bda5a49..ff38e7c 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerCLI_Functions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerCLI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerClient_Definitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerClient_Definitions.ttcn
index e66cb5b..977bd02 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerClient_Definitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerClient_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerClient_Functions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerClient_Functions.ttcn
index ab64699..f38985f 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerClient_Functions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerClient_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Definitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Definitions.ttcn
index 1d1cb5b..20104e9 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Definitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn b/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn
index 34de04a..29d1c37 100644
--- a/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Base.grp b/src/UIHandler/EPTF_CLL_UIHandler_Base.grp
index eb7f398..7fce931 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_Base.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Base.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Base_Dep.grp b/src/UIHandler/EPTF_CLL_UIHandler_Base_Dep.grp
index ea71a5f..8b9fa93 100755
--- a/src/UIHandler/EPTF_CLL_UIHandler_Base_Dep.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Base_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Browser.grp b/src/UIHandler/EPTF_CLL_UIHandler_Browser.grp
index cd37e58..05a8628 100755
--- a/src/UIHandler/EPTF_CLL_UIHandler_Browser.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Browser.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_BrowserFunctions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_BrowserFunctions.ttcn
index 26a02e5..64d5ed1 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_BrowserFunctions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_BrowserFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_CLIClientDefinitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_CLIClientDefinitions.ttcn
index f74b093..0d72fc1 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_CLIClientDefinitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_CLIClientDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcn
index e9cf5b6..ceb4a42 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcnpp b/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcnpp
index d5dbeaa..e5808a1 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcnpp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_ConvertFunctions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_ConvertFunctions.ttcn
index f79485c..12080b7 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_ConvertFunctions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_ConvertFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/UIHandler/EPTF_CLL_UIHandler_DS_Definitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_DS_Definitions.ttcn
index e4ad08d..8f89850 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_DS_Definitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_DS_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 //  Module: EPTF_CLL_UIHandler_DS_Definitions
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_DS_Functions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_DS_Functions.ttcn
index fc52c49..0cc2060 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_DS_Functions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_DS_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Definitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_Definitions.ttcn
index 93168a8..66b2493 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_Definitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp b/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp
index c8fe637..863853e 100755
--- a/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_ExternalFunctions.cc b/src/UIHandler/EPTF_CLL_UIHandler_ExternalFunctions.cc
index 19dc768..0f7afe7 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_ExternalFunctions.cc
+++ b/src/UIHandler/EPTF_CLL_UIHandler_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "EPTF_CLL_UIHandler_WidgetFunctions.hh"
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.cc b/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.cc
index eb38bd0..ed9efaf 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.cc
+++ b/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 // Clear XML namespace elements from source
 // -----------------------------------------
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.hh b/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.hh
index c1345b3..fc866ba 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.hh
+++ b/src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.hh
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "Universal_charstring.hh"
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_MsgDefinitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_MsgDefinitions.ttcn
index 5e9c2bc..0f7a53a 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_MsgDefinitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_MsgDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_PrivateFunctions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_PrivateFunctions.ttcn
index f991a65..812c6a9 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_PrivateFunctions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_PrivateFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn
index baf82c8..80d636d 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/UIHandler/EPTF_CLL_UIHandler_XSD_XTDPTemplateDefinitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_XSD_XTDPTemplateDefinitions.ttcn
index 85400d4..a9e9604 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_XSD_XTDPTemplateDefinitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_XSD_XTDPTemplateDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/UIHandler/EPTF_CLL_UIHandler_XTDPTemplateDefinitions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_XTDPTemplateDefinitions.ttcn
index 7a3a19e..c6f35d3 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_XTDPTemplateDefinitions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_XTDPTemplateDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/src/UIHandler/EPTF_CLL_UIHandler_XUL.grp b/src/UIHandler/EPTF_CLL_UIHandler_XUL.grp
index 38e0de9..7fdfd6f 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_XUL.grp
+++ b/src/UIHandler/EPTF_CLL_UIHandler_XUL.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/src/UIHandler/EPTF_CLL_UIHandler_XULFunctions.ttcn b/src/UIHandler/EPTF_CLL_UIHandler_XULFunctions.ttcn
index c69a175..0c89691 100644
--- a/src/UIHandler/EPTF_CLL_UIHandler_XULFunctions.ttcn
+++ b/src/UIHandler/EPTF_CLL_UIHandler_XULFunctions.ttcn
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/UIHandler/EPTF_CLL_Variable_UI.tpd b/src/UIHandler/EPTF_CLL_Variable_UI.tpd
index 0aa0137..8ffe6d5 100644
--- a/src/UIHandler/EPTF_CLL_Variable_UI.tpd
+++ b/src/UIHandler/EPTF_CLL_Variable_UI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/UIHandler/XTDPasp.grp b/src/UIHandler/XTDPasp.grp
index a6ced02..35d83d4 100755
--- a/src/UIHandler/XTDPasp.grp
+++ b/src/UIHandler/XTDPasp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Variable/EPTF_CLL_Variable.grp b/src/Variable/EPTF_CLL_Variable.grp
index ad9595b..f279179 100644
--- a/src/Variable/EPTF_CLL_Variable.grp
+++ b/src/Variable/EPTF_CLL_Variable.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Variable/EPTF_CLL_Variable.tpd b/src/Variable/EPTF_CLL_Variable.tpd
index d915356..5d2c181 100644
--- a/src/Variable/EPTF_CLL_Variable.tpd
+++ b/src/Variable/EPTF_CLL_Variable.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/src/Variable/EPTF_CLL_Variable_Definitions.ttcn b/src/Variable/EPTF_CLL_Variable_Definitions.ttcn
index c514716..01ad14c 100644
--- a/src/Variable/EPTF_CLL_Variable_Definitions.ttcn
+++ b/src/Variable/EPTF_CLL_Variable_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/src/Variable/EPTF_CLL_Variable_Dep.grp b/src/Variable/EPTF_CLL_Variable_Dep.grp
index d68fbcd..8482c3b 100755
--- a/src/Variable/EPTF_CLL_Variable_Dep.grp
+++ b/src/Variable/EPTF_CLL_Variable_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/src/Variable/EPTF_CLL_Variable_ExternalFunctions.cc b/src/Variable/EPTF_CLL_Variable_ExternalFunctions.cc
index c615250..1f2f6fd 100644
--- a/src/Variable/EPTF_CLL_Variable_ExternalFunctions.cc
+++ b/src/Variable/EPTF_CLL_Variable_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Variable/EPTF_CLL_Variable_Functions.ttcn b/src/Variable/EPTF_CLL_Variable_Functions.ttcn
index 58cdffd..ca9ee06 100644
--- a/src/Variable/EPTF_CLL_Variable_Functions.ttcn
+++ b/src/Variable/EPTF_CLL_Variable_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Base/EPTF_Base_Test.cfg b/test/Base/EPTF_Base_Test.cfg
index 86102c8..57e1679 100644
--- a/test/Base/EPTF_Base_Test.cfg
+++ b/test/Base/EPTF_Base_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Base/EPTF_Base_Test.prj b/test/Base/EPTF_Base_Test.prj
index 25b0ac6..c336602 100644
--- a/test/Base/EPTF_Base_Test.prj
+++ b/test/Base/EPTF_Base_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Base/EPTF_Base_Test.tpd b/test/Base/EPTF_Base_Test.tpd
index b25dcaf..754f7ec 100644
--- a/test/Base/EPTF_Base_Test.tpd
+++ b/test/Base/EPTF_Base_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Base/EPTF_Base_Test_Definitions.ttcn b/test/Base/EPTF_Base_Test_Definitions.ttcn
index 447ae10..f5169a5 100644
--- a/test/Base/EPTF_Base_Test_Definitions.ttcn
+++ b/test/Base/EPTF_Base_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Base/EPTF_Base_Test_Functions.ttcn b/test/Base/EPTF_Base_Test_Functions.ttcn
index 69d609d..e9f0238 100644
--- a/test/Base/EPTF_Base_Test_Functions.ttcn
+++ b/test/Base/EPTF_Base_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Base/EPTF_Base_Test_Testcases.ttcn b/test/Base/EPTF_Base_Test_Testcases.ttcn
index ba69c4d..ac0239b 100644
--- a/test/Base/EPTF_Base_Test_Testcases.ttcn
+++ b/test/Base/EPTF_Base_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Base/EPTF_Base_restartPart1_Test.cfg b/test/Base/EPTF_Base_restartPart1_Test.cfg
index 9cc51e5..2b6c4dc 100644
--- a/test/Base/EPTF_Base_restartPart1_Test.cfg
+++ b/test/Base/EPTF_Base_restartPart1_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Base/EPTF_Base_restartPart1_Test.prj b/test/Base/EPTF_Base_restartPart1_Test.prj
index 88ea7b1..502174b 100644
--- a/test/Base/EPTF_Base_restartPart1_Test.prj
+++ b/test/Base/EPTF_Base_restartPart1_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Base/EPTF_Base_restartPart1_Test.tpd b/test/Base/EPTF_Base_restartPart1_Test.tpd
index 2313342..fbe4973 100644
--- a/test/Base/EPTF_Base_restartPart1_Test.tpd
+++ b/test/Base/EPTF_Base_restartPart1_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Base/EPTF_Base_restartPart1_Test_Testcases.ttcn b/test/Base/EPTF_Base_restartPart1_Test_Testcases.ttcn
index 84fb627..aeb5c44 100644
--- a/test/Base/EPTF_Base_restartPart1_Test_Testcases.ttcn
+++ b/test/Base/EPTF_Base_restartPart1_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Base/EPTF_Base_restartPart2_Test.cfg b/test/Base/EPTF_Base_restartPart2_Test.cfg
index 353018c..ff5bb37 100644
--- a/test/Base/EPTF_Base_restartPart2_Test.cfg
+++ b/test/Base/EPTF_Base_restartPart2_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Base/EPTF_Base_restartPart2_Test.prj b/test/Base/EPTF_Base_restartPart2_Test.prj
index 7f8d22a..efc2b70 100644
--- a/test/Base/EPTF_Base_restartPart2_Test.prj
+++ b/test/Base/EPTF_Base_restartPart2_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Base/EPTF_Base_restartPart2_Test.tpd b/test/Base/EPTF_Base_restartPart2_Test.tpd
index 53ad152..b9c9881 100644
--- a/test/Base/EPTF_Base_restartPart2_Test.tpd
+++ b/test/Base/EPTF_Base_restartPart2_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Base/EPTF_Base_restartPart2_Test_Testcases.ttcn b/test/Base/EPTF_Base_restartPart2_Test_Testcases.ttcn
index 2e8c6a5..d22d282 100644
--- a/test/Base/EPTF_Base_restartPart2_Test_Testcases.ttcn
+++ b/test/Base/EPTF_Base_restartPart2_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Base/smokeTests.txt b/test/Base/smokeTests.txt
index 198ab1d..06df46d 100644
--- a/test/Base/smokeTests.txt
+++ b/test/Base/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Base_Test_Testcases.tc_EPTF_Base_test
 EPTF_Base_Test_Testcases.tc_EPTF_Base_test_stopRemote
diff --git a/test/Buffer/Buffer_Test.grp b/test/Buffer/Buffer_Test.grp
index 5b2cca5..493b4d7 100644
--- a/test/Buffer/Buffer_Test.grp
+++ b/test/Buffer/Buffer_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/Buffer/EPTF_Buffer.cfg b/test/Buffer/EPTF_Buffer.cfg
index 1a958a5..973096f 100644
--- a/test/Buffer/EPTF_Buffer.cfg
+++ b/test/Buffer/EPTF_Buffer.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask :=  TTCN_ERROR | TTCN_ACTION | TTCN_TESTCASE | TTCN_STATISTICS | TTCN_WARNING | LOG_ALL #| DEBUG
diff --git a/test/Buffer/EPTF_Buffer_Test.prj b/test/Buffer/EPTF_Buffer_Test.prj
index 984fddf..483d8d6 100644
--- a/test/Buffer/EPTF_Buffer_Test.prj
+++ b/test/Buffer/EPTF_Buffer_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Buffer/EPTF_Buffer_Test.tpd b/test/Buffer/EPTF_Buffer_Test.tpd
index dd8f3a0..e2a287d 100644
--- a/test/Buffer/EPTF_Buffer_Test.tpd
+++ b/test/Buffer/EPTF_Buffer_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Buffer/EPTF_CLL_Buffer_Test_Testcases.ttcn b/test/Buffer/EPTF_CLL_Buffer_Test_Testcases.ttcn
index 3a1cb8c..555764f 100644
--- a/test/Buffer/EPTF_CLL_Buffer_Test_Testcases.ttcn
+++ b/test/Buffer/EPTF_CLL_Buffer_Test_Testcases.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Buffer/smokeTests.txt b/test/Buffer/smokeTests.txt
index 229deb2..b3b00a0 100644
--- a/test/Buffer/smokeTests.txt
+++ b/test/Buffer/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_CLL_Buffer_Test_Testcases.tc_EPTF_Buffer_Test_main
 EPTF_CLL_Buffer_Test_Testcases.tc_EPTF_Buffer_Test_main2
diff --git a/test/CentralScheduling/CentralScheduling_Gui.xml b/test/CentralScheduling/CentralScheduling_Gui.xml
index 49c2860..3157bd3 100644
--- a/test/CentralScheduling/CentralScheduling_Gui.xml
+++ b/test/CentralScheduling/CentralScheduling_Gui.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/test/CentralScheduling/EPTF_CS_Test.cfg b/test/CentralScheduling/EPTF_CS_Test.cfg
index 78af6ac..2ccbef2 100644
--- a/test/CentralScheduling/EPTF_CS_Test.cfg
+++ b/test/CentralScheduling/EPTF_CS_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/CentralScheduling/EPTF_CS_Test_Definitions.ttcn b/test/CentralScheduling/EPTF_CS_Test_Definitions.ttcn
index 384f573..1de84f4 100644
--- a/test/CentralScheduling/EPTF_CS_Test_Definitions.ttcn
+++ b/test/CentralScheduling/EPTF_CS_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/CentralScheduling/EPTF_CS_Test_Functions.ttcn b/test/CentralScheduling/EPTF_CS_Test_Functions.ttcn
index e0e0065..1aa95e8 100644
--- a/test/CentralScheduling/EPTF_CS_Test_Functions.ttcn
+++ b/test/CentralScheduling/EPTF_CS_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/CentralScheduling/EPTF_CS_Test_Tescases.ttcn b/test/CentralScheduling/EPTF_CS_Test_Tescases.ttcn
index 63f18ee..f12d86f 100644
--- a/test/CentralScheduling/EPTF_CS_Test_Tescases.ttcn
+++ b/test/CentralScheduling/EPTF_CS_Test_Tescases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/CommandLineInterface/EPTF_CLI_Test.grp b/test/CommandLineInterface/EPTF_CLI_Test.grp
index 0579066..c11fa7c 100644
--- a/test/CommandLineInterface/EPTF_CLI_Test.grp
+++ b/test/CommandLineInterface/EPTF_CLI_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/test/CommandLineInterface/EPTF_CLI_Test.prj b/test/CommandLineInterface/EPTF_CLI_Test.prj
index f6ad098..c7f5b9e 100644
--- a/test/CommandLineInterface/EPTF_CLI_Test.prj
+++ b/test/CommandLineInterface/EPTF_CLI_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/CommandLineInterface/EPTF_CLI_Test.tpd b/test/CommandLineInterface/EPTF_CLI_Test.tpd
index 1c62dd5..4ea4cdb 100644
--- a/test/CommandLineInterface/EPTF_CLI_Test.tpd
+++ b/test/CommandLineInterface/EPTF_CLI_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/CommandLineInterface/EPTF_CLI_Test.ttcn b/test/CommandLineInterface/EPTF_CLI_Test.ttcn
index 78f0656..01be515 100644
--- a/test/CommandLineInterface/EPTF_CLI_Test.ttcn
+++ b/test/CommandLineInterface/EPTF_CLI_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/CommandLineInterface/EPTF_CLI_Test_Definitions.ttcn b/test/CommandLineInterface/EPTF_CLI_Test_Definitions.ttcn
index fa5a29c..504052e 100644
--- a/test/CommandLineInterface/EPTF_CLI_Test_Definitions.ttcn
+++ b/test/CommandLineInterface/EPTF_CLI_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/CommandLineInterface/EPTF_CLI_Test_Functions.ttcn b/test/CommandLineInterface/EPTF_CLI_Test_Functions.ttcn
index d5e8af3..0a1e47e 100644
--- a/test/CommandLineInterface/EPTF_CLI_Test_Functions.ttcn
+++ b/test/CommandLineInterface/EPTF_CLI_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/CommandLineInterface/Makefile_patch.sh b/test/CommandLineInterface/Makefile_patch.sh
index 87d8999..da252e6 100755
--- a/test/CommandLineInterface/Makefile_patch.sh
+++ b/test/CommandLineInterface/Makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e '
 s/SOLARIS8_LIBS = -lsocket -lnsl/SOLARIS8_LIBS = -lsocket -lnsl -lresolv/g
diff --git a/test/CommandLineInterface/cli.cfg b/test/CommandLineInterface/cli.cfg
index e59469f..27fe3fa 100644
--- a/test/CommandLineInterface/cli.cfg
+++ b/test/CommandLineInterface/cli.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [DEFINE]
 
diff --git a/test/CommandLineInterface/smokeTests.txt b/test/CommandLineInterface/smokeTests.txt
index f5f3ee5..0098d56 100644
--- a/test/CommandLineInterface/smokeTests.txt
+++ b/test/CommandLineInterface/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_CLI_Test.tc_EPTF_CLI_Test_registerCommand
 EPTF_CLI_Test.tc_EPTF_CLI_Test_executeCustomCommand
diff --git a/test/Common/CompileTest_AppLibs.grp b/test/Common/CompileTest_AppLibs.grp
index d47da9e..3ea3976 100644
--- a/test/Common/CompileTest_AppLibs.grp
+++ b/test/Common/CompileTest_AppLibs.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/Common/CompileTest_AppLibs.prj b/test/Common/CompileTest_AppLibs.prj
index c6e83e9..ed21ba1 100644
--- a/test/Common/CompileTest_AppLibs.prj
+++ b/test/Common/CompileTest_AppLibs.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Common/CompileTest_AppLibs_patch.sh b/test/Common/CompileTest_AppLibs_patch.sh
index 362a4af..9a63eb5 100755
--- a/test/Common/CompileTest_AppLibs_patch.sh
+++ b/test/Common/CompileTest_AppLibs_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/test/Common/CompileTest_all.prj b/test/Common/CompileTest_all.prj
index 794e8ba..11cad34 100644
--- a/test/Common/CompileTest_all.prj
+++ b/test/Common/CompileTest_all.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Common/CompileTest_all.tpd b/test/Common/CompileTest_all.tpd
index 6c6b418..364616e 100644
--- a/test/Common/CompileTest_all.tpd
+++ b/test/Common/CompileTest_all.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Common/CompileTest_demo.grp b/test/Common/CompileTest_demo.grp
index 7bd535e..f57298e 100644
--- a/test/Common/CompileTest_demo.grp
+++ b/test/Common/CompileTest_demo.grp
@@ -4,9 +4,9 @@
 //  Copyright (c) 2000-2017 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                                 //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/Common/CompileTest_makefile_patch.sh b/test/Common/CompileTest_makefile_patch.sh
index b05240f..a2a3d29 100755
--- a/test/Common/CompileTest_makefile_patch.sh
+++ b/test/Common/CompileTest_makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/test/Common/CompileTest_src.grp b/test/Common/CompileTest_src.grp
index e321f73..c1474c9 100644
--- a/test/Common/CompileTest_src.grp
+++ b/test/Common/CompileTest_src.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/Common/EPTF_Common_IndexArray_Test.cfg b/test/Common/EPTF_Common_IndexArray_Test.cfg
index 877c55a..5bbb0dd 100644
--- a/test/Common/EPTF_Common_IndexArray_Test.cfg
+++ b/test/Common/EPTF_Common_IndexArray_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Common/EPTF_Common_IndexArray_Test.prj b/test/Common/EPTF_Common_IndexArray_Test.prj
index 39d055d..7f3f6b9 100644
--- a/test/Common/EPTF_Common_IndexArray_Test.prj
+++ b/test/Common/EPTF_Common_IndexArray_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Common/EPTF_Common_IndexArray_Test.tpd b/test/Common/EPTF_Common_IndexArray_Test.tpd
index 9410719..3cd08d6 100644
--- a/test/Common/EPTF_Common_IndexArray_Test.tpd
+++ b/test/Common/EPTF_Common_IndexArray_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Common/EPTF_Common_IndexArray_Test_Definitions.ttcn b/test/Common/EPTF_Common_IndexArray_Test_Definitions.ttcn
index 78fd6ec..64d1adc 100644
--- a/test/Common/EPTF_Common_IndexArray_Test_Definitions.ttcn
+++ b/test/Common/EPTF_Common_IndexArray_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Common/EPTF_Common_IndexArray_Test_Functions.ttcn b/test/Common/EPTF_Common_IndexArray_Test_Functions.ttcn
index 6bd45e6..00d94b5 100644
--- a/test/Common/EPTF_Common_IndexArray_Test_Functions.ttcn
+++ b/test/Common/EPTF_Common_IndexArray_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Common/EPTF_Common_IndexArray_Test_Testcases.ttcn b/test/Common/EPTF_Common_IndexArray_Test_Testcases.ttcn
index 3992994..229314d 100644
--- a/test/Common/EPTF_Common_IndexArray_Test_Testcases.ttcn
+++ b/test/Common/EPTF_Common_IndexArray_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Common/EPTF_Common_Test.cfg b/test/Common/EPTF_Common_Test.cfg
index cfcf58b..031e73e 100644
--- a/test/Common/EPTF_Common_Test.cfg
+++ b/test/Common/EPTF_Common_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Common/EPTF_Common_Test.prj b/test/Common/EPTF_Common_Test.prj
index bb09051..b9039c8 100644
--- a/test/Common/EPTF_Common_Test.prj
+++ b/test/Common/EPTF_Common_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Common/EPTF_Common_Test.tpd b/test/Common/EPTF_Common_Test.tpd
index 347fe3e..af47697 100644
--- a/test/Common/EPTF_Common_Test.tpd
+++ b/test/Common/EPTF_Common_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Common/EPTF_Common_Test_Definitions.ttcn b/test/Common/EPTF_Common_Test_Definitions.ttcn
index 51b8ed2..d4da6b1 100644
--- a/test/Common/EPTF_Common_Test_Definitions.ttcn
+++ b/test/Common/EPTF_Common_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Common/EPTF_Common_Test_Functions.ttcn b/test/Common/EPTF_Common_Test_Functions.ttcn
index d86607a..02a40ca 100644
--- a/test/Common/EPTF_Common_Test_Functions.ttcn
+++ b/test/Common/EPTF_Common_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Common/EPTF_Common_Test_Testcases.ttcn b/test/Common/EPTF_Common_Test_Testcases.ttcn
index ab1bc71..d3fa366 100644
--- a/test/Common/EPTF_Common_Test_Testcases.ttcn
+++ b/test/Common/EPTF_Common_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Common/Makefile b/test/Common/Makefile
index 1568d53..02dac1c 100644
--- a/test/Common/Makefile
+++ b/test/Common/Makefile
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # The following make commands are available:
diff --git a/test/Common/smokeTests.txt b/test/Common/smokeTests.txt
index c48c306..cad1648 100644
--- a/test/Common/smokeTests.txt
+++ b/test/Common/smokeTests.txt
@@ -2,8 +2,8 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Common_Test_Testcases.tc_common_test
diff --git a/test/Common/smokeTestsIA.txt b/test/Common/smokeTestsIA.txt
index 6980b3c..25fc335 100644
--- a/test/Common/smokeTestsIA.txt
+++ b/test/Common/smokeTestsIA.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Common_IndexArray_Test_Testcases.tc_common_indexArray_test_getOrCreateFreeSlot
 EPTF_Common_IndexArray_Test_Testcases.tc_common_indexArray_test_getElement
diff --git a/test/DataSource/DSTestGUI.xml b/test/DataSource/DSTestGUI.xml
index 94caab6..837de71 100644
--- a/test/DataSource/DSTestGUI.xml
+++ b/test/DataSource/DSTestGUI.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <window xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl' height='386.000000' 
diff --git a/test/DataSource/EPTF_DataSource_Test.cfg b/test/DataSource/EPTF_DataSource_Test.cfg
index 9944831..e30a6e1 100644
--- a/test/DataSource/EPTF_DataSource_Test.cfg
+++ b/test/DataSource/EPTF_DataSource_Test.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 //                                                                           //

 ///////////////////////////////////////////////////////////////////////////////

 [MODULE_PARAMETERS]

diff --git a/test/DataSource/EPTF_DataSource_Test.grp b/test/DataSource/EPTF_DataSource_Test.grp
index 671ea89..0cd7e46 100644
--- a/test/DataSource/EPTF_DataSource_Test.grp
+++ b/test/DataSource/EPTF_DataSource_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 -->

 <!DOCTYPE TITAN_GUI_FileGroup_file>

diff --git a/test/DataSource/EPTF_DataSource_Test.prj b/test/DataSource/EPTF_DataSource_Test.prj
index d047516..21b0fef 100644
--- a/test/DataSource/EPTF_DataSource_Test.prj
+++ b/test/DataSource/EPTF_DataSource_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/DataSource/EPTF_DataSource_Test.tpd b/test/DataSource/EPTF_DataSource_Test.tpd
index 68f6d91..dc71e28 100644
--- a/test/DataSource/EPTF_DataSource_Test.tpd
+++ b/test/DataSource/EPTF_DataSource_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/DataSource/EPTF_DataSource_Test_Definitions.ttcn b/test/DataSource/EPTF_DataSource_Test_Definitions.ttcn
index c87834e..4101654 100644
--- a/test/DataSource/EPTF_DataSource_Test_Definitions.ttcn
+++ b/test/DataSource/EPTF_DataSource_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/test/DataSource/EPTF_DataSource_Test_Functions.ttcn b/test/DataSource/EPTF_DataSource_Test_Functions.ttcn
index 7eadbd0..671d7d9 100644
--- a/test/DataSource/EPTF_DataSource_Test_Functions.ttcn
+++ b/test/DataSource/EPTF_DataSource_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/test/DataSource/EPTF_DataSource_Test_Testcases.ttcn b/test/DataSource/EPTF_DataSource_Test_Testcases.ttcn
index d016ab7..c8b5a03 100644
--- a/test/DataSource/EPTF_DataSource_Test_Testcases.ttcn
+++ b/test/DataSource/EPTF_DataSource_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DataSource/HN97107.xml b/test/DataSource/HN97107.xml
index 411ff69..ed235a2 100644
--- a/test/DataSource/HN97107.xml
+++ b/test/DataSource/HN97107.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <tq0001:Widgets xmlns:tq0001='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/test/DataSource/Makefile_script b/test/DataSource/Makefile_script
index d3a0a60..ec2a8c3 100755
--- a/test/DataSource/Makefile_script
+++ b/test/DataSource/Makefile_script
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e '
 s/CPPFLAGS = .*/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -DNO_IPV6/g
diff --git a/test/DataSource/smokeTests.txt b/test/DataSource/smokeTests.txt
index aadeb2a..80d7ace 100644
--- a/test/DataSource/smokeTests.txt
+++ b/test/DataSource/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_DataSource_Test_Testcases.tc_EPTF_CLL_Datasource_Test_Exp_IteratorValue
 EPTF_DataSource_Test_Testcases.tc_EPTF_CLL_Datasource_Test_Exp_IteratorValue_2
diff --git a/test/DsRestAPI/DsRestAPI_stdout.py b/test/DsRestAPI/DsRestAPI_stdout.py
index 3e0a79c..6d212e5 100755
--- a/test/DsRestAPI/DsRestAPI_stdout.py
+++ b/test/DsRestAPI/DsRestAPI_stdout.py
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import urllib2
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.cfg b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.cfg
index 6fd2fc1..bf31af4 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.cfg
+++ b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.grp b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.grp
index 591c2ed..b01d98f 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.grp
+++ b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.prj b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.prj
index 5c0ca31..90dcb2e 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.prj
+++ b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Definitions.ttcn b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Definitions.ttcn
index 4f85794..4d112c3 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Definitions.ttcn
+++ b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Functions.ttcn b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Functions.ttcn
index a5da7f9..d3a6698 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Functions.ttcn
+++ b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Testcases.ttcn b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Testcases.ttcn
index e21e754..2a8e053 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Testcases.ttcn
+++ b/test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test.cfg b/test/DsRestAPI/EPTF_DsRestAPI_Test.cfg
index d11ea31..e2e81e6 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test.cfg
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test.grp b/test/DsRestAPI/EPTF_DsRestAPI_Test.grp
index 1000c42..0c3ca50 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test.grp
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test.prj b/test/DsRestAPI/EPTF_DsRestAPI_Test.prj
index a388615..08d9027 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test.prj
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test.tpd b/test/DsRestAPI/EPTF_DsRestAPI_Test.tpd
index c7c5d55..8ba713e 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test.tpd
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test_Definitions.ttcn b/test/DsRestAPI/EPTF_DsRestAPI_Test_Definitions.ttcn
index 03665e4..878dfa5 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test_Definitions.ttcn
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test_ExternalFunctions.cc b/test/DsRestAPI/EPTF_DsRestAPI_Test_ExternalFunctions.cc
index 3576db9..64d2229 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test_ExternalFunctions.cc
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test_Functions.ttcn b/test/DsRestAPI/EPTF_DsRestAPI_Test_Functions.ttcn
index 75cdfe5..82de080 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test_Functions.ttcn
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DsRestAPI/EPTF_DsRestAPI_Test_Testcases.ttcn b/test/DsRestAPI/EPTF_DsRestAPI_Test_Testcases.ttcn
index 9dc7f67..e961cb9 100644
--- a/test/DsRestAPI/EPTF_DsRestAPI_Test_Testcases.ttcn
+++ b/test/DsRestAPI/EPTF_DsRestAPI_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/DsRestAPI/PerfTest/storePerformanceResults.sh b/test/DsRestAPI/PerfTest/storePerformanceResults.sh
index 4e28389..5d9b1d3 100755
--- a/test/DsRestAPI/PerfTest/storePerformanceResults.sh
+++ b/test/DsRestAPI/PerfTest/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # Add this to the CFG file:
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_CLITest_Definitions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_CLITest_Definitions.ttcn
index 7859542..15010c5 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_CLITest_Definitions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_CLITest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_CLITest_TestCases.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_CLITest_TestCases.ttcn
index a944348..f6e7cd4 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_CLITest_TestCases.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_CLITest_TestCases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest.cfg b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest.cfg
index 6020f53..dd1c373 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest.cfg
+++ b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest_Testcases.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest_Testcases.ttcn
index 308aa33..432fa05 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest_Testcases.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
index 2e93daf..e227c97 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.cfg b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.cfg
index 35d131d..272d4a1 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.cfg
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
index e043226..e8617bc 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Definitions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Definitions.ttcn
index a736208..2895873 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Definitions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_ExternalFunctions.cc b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_ExternalFunctions.cc
index a314f9e..f7c1770 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_ExternalFunctions.cc
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include <string.h>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Functions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Functions.ttcn
index 5d032ec..085e399 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Functions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Testcases.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Testcases.ttcn
index 35cb4a1..0d60eda 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Testcases.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.cfg b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.cfg
index 814680b..d015fd9 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.cfg
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
index 32ded64..aec02cb 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Definitions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Definitions.ttcn
index 7084911..968eb6a 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Definitions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Functions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Functions.ttcn
index bf45fc3..d7b4816 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Functions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Testcases.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Testcases.ttcn
index dcc1c11..fa3d64d 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Testcases.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test.cfg b/test/ExecCtrl/EPTF_ExecCtrl_Test.cfg
index 8ef4896..e70bace 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test.cfg
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_EPTF_UIHandler_Authmsg := ""
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test.prj b/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
index 578e75d..fad5465 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test.tpd b/test/ExecCtrl/EPTF_ExecCtrl_Test.tpd
index 3b3f396..f0b14af 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test.tpd
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test_Definitions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_Test_Definitions.ttcn
index c29b64b..19a2210 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test_Definitions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test_ExternalFunctions.cc b/test/ExecCtrl/EPTF_ExecCtrl_Test_ExternalFunctions.cc
index 49e151d..81a6c23 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test_ExternalFunctions.cc
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include <string.h>
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test_Functions.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_Test_Functions.ttcn
index 68c27f9..a9ad477 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test_Functions.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.cfg b/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.cfg
index 397274a..53a9a9a 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.cfg
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_EPTF_UIHandler_Authmsg := ""
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.tpd b/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.tpd
index fb822b0..99b99cd 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.tpd
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/ExecCtrl/EPTF_ExecCtrl_Test_Testcases.ttcn b/test/ExecCtrl/EPTF_ExecCtrl_Test_Testcases.ttcn
index d8b70af..a8c7cd3 100644
--- a/test/ExecCtrl/EPTF_ExecCtrl_Test_Testcases.ttcn
+++ b/test/ExecCtrl/EPTF_ExecCtrl_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ExecCtrl/PerfTest/storePerformanceResults.sh b/test/ExecCtrl/PerfTest/storePerformanceResults.sh
index dcbf05d..7209659 100755
--- a/test/ExecCtrl/PerfTest/storePerformanceResults.sh
+++ b/test/ExecCtrl/PerfTest/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # Add thich to the CFG file:
diff --git a/test/ExecCtrl/gui.xml b/test/ExecCtrl/gui.xml
index b317854..d4eae18 100644
--- a/test/ExecCtrl/gui.xml
+++ b/test/ExecCtrl/gui.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/ExecCtrl/makePatch.sh b/test/ExecCtrl/makePatch.sh
index e7d2981..ff20de3 100755
--- a/test/ExecCtrl/makePatch.sh
+++ b/test/ExecCtrl/makePatch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/test/ExecCtrl/oldgui.xml b/test/ExecCtrl/oldgui.xml
index bcc3bb5..432e399 100644
--- a/test/ExecCtrl/oldgui.xml
+++ b/test/ExecCtrl/oldgui.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/ExecCtrl/runTop.sh b/test/ExecCtrl/runTop.sh
index a3b6e3f..48187ca 100755
--- a/test/ExecCtrl/runTop.sh
+++ b/test/ExecCtrl/runTop.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 #endres=`top bd00.50n2|grep Cpu| tail -n1 | sed 's/.*Cpu(s): //g;s/%us,.*//g'`   // global cpu usage
diff --git a/test/ExecCtrl/smokeTests.txt b/test/ExecCtrl/smokeTests.txt
index fe1f7eb..a9d2aa5 100644
--- a/test/ExecCtrl/smokeTests.txt
+++ b/test/ExecCtrl/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_ExecCtrl_Test_Testcases.tc_EPTF_ExecCtrl_Test_init_CT
 EPTF_ExecCtrl_Test_Testcases.tc_EPTF_ExecCtrl_Test_cleanUp_CT
diff --git a/test/FreeBusyQueue/EPTF_FBQ_Test.cfg b/test/FreeBusyQueue/EPTF_FBQ_Test.cfg
index f751d28..16a0e9a 100644
--- a/test/FreeBusyQueue/EPTF_FBQ_Test.cfg
+++ b/test/FreeBusyQueue/EPTF_FBQ_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/FreeBusyQueue/EPTF_FBQ_Test.prj b/test/FreeBusyQueue/EPTF_FBQ_Test.prj
index e2f8f42..0c36be2 100644
--- a/test/FreeBusyQueue/EPTF_FBQ_Test.prj
+++ b/test/FreeBusyQueue/EPTF_FBQ_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/FreeBusyQueue/EPTF_FBQ_Test.tpd b/test/FreeBusyQueue/EPTF_FBQ_Test.tpd
index e31713a..cf72d5b 100644
--- a/test/FreeBusyQueue/EPTF_FBQ_Test.tpd
+++ b/test/FreeBusyQueue/EPTF_FBQ_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/FreeBusyQueue/EPTF_FBQ_Test.ttcn b/test/FreeBusyQueue/EPTF_FBQ_Test.ttcn
index 75c4707..9a59116 100644
--- a/test/FreeBusyQueue/EPTF_FBQ_Test.ttcn
+++ b/test/FreeBusyQueue/EPTF_FBQ_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_FBQ_Test
 {
diff --git a/test/FreeBusyQueue/smokeTests.txt b/test/FreeBusyQueue/smokeTests.txt
index 5ffe3f2..e632904 100644
--- a/test/FreeBusyQueue/smokeTests.txt
+++ b/test/FreeBusyQueue/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_FBQ_Test.tc_EPTF_FBQ_Test_getQueueDidx
 EPTF_FBQ_Test.tc_EPTF_FBQ_Test_createFreeSlots
diff --git a/test/GUIViewer/EPTF_GUIViewer_Test.grp b/test/GUIViewer/EPTF_GUIViewer_Test.grp
index b4288e2..eb398a2 100644
--- a/test/GUIViewer/EPTF_GUIViewer_Test.grp
+++ b/test/GUIViewer/EPTF_GUIViewer_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/test/GUIViewer/EPTF_GUIViewer_Test_Testcases.ttcn b/test/GUIViewer/EPTF_GUIViewer_Test_Testcases.ttcn
index 92960d7..1be14a0 100644
--- a/test/GUIViewer/EPTF_GUIViewer_Test_Testcases.ttcn
+++ b/test/GUIViewer/EPTF_GUIViewer_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/GUIViewer/GUIViewer_Test.cfg b/test/GUIViewer/GUIViewer_Test.cfg
index 92a8bff..9a7cb50 100644
--- a/test/GUIViewer/GUIViewer_Test.cfg
+++ b/test/GUIViewer/GUIViewer_Test.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj b/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj
index a2deaf7..dea8d38 100644
--- a/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj
+++ b/test/GUIViewer/GUIViewer_Test_without_simulation_getData_nonblocking.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/HashMap/EPTF_HashMap_Test.prj b/test/HashMap/EPTF_HashMap_Test.prj
index 1be8bba..45f8de1 100644
--- a/test/HashMap/EPTF_HashMap_Test.prj
+++ b/test/HashMap/EPTF_HashMap_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/HashMap/EPTF_HashMap_Test.tpd b/test/HashMap/EPTF_HashMap_Test.tpd
index 25aa923..375cabc 100644
--- a/test/HashMap/EPTF_HashMap_Test.tpd
+++ b/test/HashMap/EPTF_HashMap_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/HashMap/HashMap.cfg b/test/HashMap/HashMap.cfg
index 5fe89bf..706e890 100644
--- a/test/HashMap/HashMap.cfg
+++ b/test/HashMap/HashMap.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_CLL_debug_acceptableMaxSizeOfGrowingVariables := 10;
diff --git a/test/HashMap/HashMap_global_test.ttcn b/test/HashMap/HashMap_global_test.ttcn
index 7193afd..2f47ba4 100644
--- a/test/HashMap/HashMap_global_test.ttcn
+++ b/test/HashMap/HashMap_global_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HashMap/HashMap_int2int_test.ttcn b/test/HashMap/HashMap_int2int_test.ttcn
index e07400d..48ac053 100644
--- a/test/HashMap/HashMap_int2int_test.ttcn
+++ b/test/HashMap/HashMap_int2int_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HashMap/HashMap_oct2int_test.ttcn b/test/HashMap/HashMap_oct2int_test.ttcn
index 5e5299f..5584cb0 100644
--- a/test/HashMap/HashMap_oct2int_test.ttcn
+++ b/test/HashMap/HashMap_oct2int_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HashMap/HashMap_perfTest.ttcn b/test/HashMap/HashMap_perfTest.ttcn
index 99c8c42..042653b 100644
--- a/test/HashMap/HashMap_perfTest.ttcn
+++ b/test/HashMap/HashMap_perfTest.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HashMap/HashMap_str2int_test.ttcn b/test/HashMap/HashMap_str2int_test.ttcn
index a919b6a..76612ce 100644
--- a/test/HashMap/HashMap_str2int_test.ttcn
+++ b/test/HashMap/HashMap_str2int_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HashMap/HashMap_stresstest.ttcn b/test/HashMap/HashMap_stresstest.ttcn
index 36a494e..847655f 100644
--- a/test/HashMap/HashMap_stresstest.ttcn
+++ b/test/HashMap/HashMap_stresstest.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HashMap/HashMap_test.grp b/test/HashMap/HashMap_test.grp
index f1f377b..739fb22 100644
--- a/test/HashMap/HashMap_test.grp
+++ b/test/HashMap/HashMap_test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/HashMap/smokeTests.txt b/test/HashMap/smokeTests.txt
index 132de16..d63abf3 100644
--- a/test/HashMap/smokeTests.txt
+++ b/test/HashMap/smokeTests.txt
@@ -2,8 +2,8 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 HashMap_global_test.tc_HashMap_global_test
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test.cfg b/test/HostAdmin/EPTF_HostAdmin_Test.cfg
index 12c3eb4..9f4ff6a 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test.cfg
+++ b/test/HostAdmin/EPTF_HostAdmin_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 #TCPPort := 9999
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test.prj b/test/HostAdmin/EPTF_HostAdmin_Test.prj
index 7fa75ba..5ef86c5 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test.prj
+++ b/test/HostAdmin/EPTF_HostAdmin_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test.tpd b/test/HostAdmin/EPTF_HostAdmin_Test.tpd
index b602e1b..f556913 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test.tpd
+++ b/test/HostAdmin/EPTF_HostAdmin_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test_Definitions.ttcn b/test/HostAdmin/EPTF_HostAdmin_Test_Definitions.ttcn
index f8ce9ba..6486bda 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test_Definitions.ttcn
+++ b/test/HostAdmin/EPTF_HostAdmin_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test_ExternalFunctions.cc b/test/HostAdmin/EPTF_HostAdmin_Test_ExternalFunctions.cc
index 73eec3a..d083aa8 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test_ExternalFunctions.cc
+++ b/test/HostAdmin/EPTF_HostAdmin_Test_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test_Functions.ttcn b/test/HostAdmin/EPTF_HostAdmin_Test_Functions.ttcn
index fec2d00..ca195f7 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test_Functions.ttcn
+++ b/test/HostAdmin/EPTF_HostAdmin_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HostAdmin/EPTF_HostAdmin_Test_Testcases.ttcn b/test/HostAdmin/EPTF_HostAdmin_Test_Testcases.ttcn
index 59d7de3..358e2d0 100644
--- a/test/HostAdmin/EPTF_HostAdmin_Test_Testcases.ttcn
+++ b/test/HostAdmin/EPTF_HostAdmin_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/HostAdmin/gui.xml b/test/HostAdmin/gui.xml
index 2cbf3f0..0ba9bb5 100755
--- a/test/HostAdmin/gui.xml
+++ b/test/HostAdmin/gui.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/HostAdmin/gui_genapp_hostadmin_tabpanel.xml b/test/HostAdmin/gui_genapp_hostadmin_tabpanel.xml
index aa9337f..5c42d0f 100644
--- a/test/HostAdmin/gui_genapp_hostadmin_tabpanel.xml
+++ b/test/HostAdmin/gui_genapp_hostadmin_tabpanel.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/HostAdmin/gui_genapp_hostadmin_tabpanel_withOverloadDetection.xml b/test/HostAdmin/gui_genapp_hostadmin_tabpanel_withOverloadDetection.xml
index 555b80b..4b5e536 100644
--- a/test/HostAdmin/gui_genapp_hostadmin_tabpanel_withOverloadDetection.xml
+++ b/test/HostAdmin/gui_genapp_hostadmin_tabpanel_withOverloadDetection.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/HostAdmin/hostadmin_gui.xml b/test/HostAdmin/hostadmin_gui.xml
index 66d7732..24aa58e 100644
--- a/test/HostAdmin/hostadmin_gui.xml
+++ b/test/HostAdmin/hostadmin_gui.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/HostAdmin/makefile_patch.sh b/test/HostAdmin/makefile_patch.sh
index db83c7a..9315b04 100755
--- a/test/HostAdmin/makefile_patch.sh
+++ b/test/HostAdmin/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/test/HostAdmin/smokeTests.txt b/test/HostAdmin/smokeTests.txt
index 0eb97ae..1d889be 100644
--- a/test/HostAdmin/smokeTests.txt
+++ b/test/HostAdmin/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_HostAdmin_Test_Testcases.tc_HostAdmin_LocalMeasure
 EPTF_HostAdmin_Test_Testcases.tc_EPTF_HostAdmin_Test_behavior
diff --git a/test/ILog/EPTF_ILogString_Test.ttcn b/test/ILog/EPTF_ILogString_Test.ttcn
index 1a3ac25..16236ee 100644
--- a/test/ILog/EPTF_ILogString_Test.ttcn
+++ b/test/ILog/EPTF_ILogString_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/ILog/EPTF_ILog_Test.cfg b/test/ILog/EPTF_ILog_Test.cfg
index 751468c..f060a87 100644
--- a/test/ILog/EPTF_ILog_Test.cfg
+++ b/test/ILog/EPTF_ILog_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 
diff --git a/test/ILog/EPTF_ILog_Test.grp b/test/ILog/EPTF_ILog_Test.grp
index d65f60f..e8960b7 100644
--- a/test/ILog/EPTF_ILog_Test.grp
+++ b/test/ILog/EPTF_ILog_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/ILog/EPTF_ILog_Test.prj b/test/ILog/EPTF_ILog_Test.prj
index 6ce2c7b..9a3da1d 100644
--- a/test/ILog/EPTF_ILog_Test.prj
+++ b/test/ILog/EPTF_ILog_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/ILog/EPTF_ILog_Test.tpd b/test/ILog/EPTF_ILog_Test.tpd
index 2e0e8b7..f0ffc79 100644
--- a/test/ILog/EPTF_ILog_Test.tpd
+++ b/test/ILog/EPTF_ILog_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/ILog/EPTF_ILog_Test.ttcn b/test/ILog/EPTF_ILog_Test.ttcn
index 6231ff7..7371e81 100644
--- a/test/ILog/EPTF_ILog_Test.ttcn
+++ b/test/ILog/EPTF_ILog_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
index 0bbaacd..cda624c 100644
--- a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
+++ b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.tpd b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.tpd
index f038314..13aef23 100644
--- a/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.tpd
+++ b/test/LGenBase/EPTF_CLL_LGenBase_PerfTest.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/LGenBase/EPTF_CLL_LGenBase_Test.grp b/test/LGenBase/EPTF_CLL_LGenBase_Test.grp
index edd7d81..f2506ed 100644
--- a/test/LGenBase/EPTF_CLL_LGenBase_Test.grp
+++ b/test/LGenBase/EPTF_CLL_LGenBase_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/LGenBase/EPTF_LGenBase_Test.cfg b/test/LGenBase/EPTF_LGenBase_Test.cfg
index e1ed550..be5fb50 100644
--- a/test/LGenBase/EPTF_LGenBase_Test.cfg
+++ b/test/LGenBase/EPTF_LGenBase_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 
diff --git a/test/LGenBase/EPTF_LGenBase_Test.grp b/test/LGenBase/EPTF_LGenBase_Test.grp
index bd4fbfd..a9874d6 100644
--- a/test/LGenBase/EPTF_LGenBase_Test.grp
+++ b/test/LGenBase/EPTF_LGenBase_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/LGenBase/EPTF_LGenBase_Test.prj b/test/LGenBase/EPTF_LGenBase_Test.prj
index 2372337..979b8e2 100644
--- a/test/LGenBase/EPTF_LGenBase_Test.prj
+++ b/test/LGenBase/EPTF_LGenBase_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/LGenBase/EPTF_LGenBase_Test.tpd b/test/LGenBase/EPTF_LGenBase_Test.tpd
index 6eacaa1..df45919 100644
--- a/test/LGenBase/EPTF_LGenBase_Test.tpd
+++ b/test/LGenBase/EPTF_LGenBase_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.cfg b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.cfg
index 720140b..6b32c37 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.cfg
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 [MODULE_PARAMETERS]
diff --git a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
index 4b4dc28..5328291 100755
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.tpd b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.tpd
index 952f385..86d7367 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.tpd
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.ttcn b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.ttcn
index a46cc19..da55cd3 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.xml b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.xml
index b325fcd..3cc990d 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.xml
+++ b/test/LGenBase/EPTF_LGenBase_Test_CustomGUI.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/test/LGenBase/EPTF_LGenBase_Test_Definitions.ttcn b/test/LGenBase/EPTF_LGenBase_Test_Definitions.ttcn
index b437a6f..3312082 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_Definitions.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_Functions.ttcn b/test/LGenBase/EPTF_LGenBase_Test_Functions.ttcn
index 7169a0c..a76a864 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_Functions.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_PhaseTestcases.ttcn b/test/LGenBase/EPTF_LGenBase_Test_PhaseTestcases.ttcn
index 1f3b369..993a1b9 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_PhaseTestcases.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_PhaseTestcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_Templates.ttcn b/test/LGenBase/EPTF_LGenBase_Test_Templates.ttcn
index fdb14fd..0dc5c3f 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_Templates.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_Templates.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_Testcases.cfg b/test/LGenBase/EPTF_LGenBase_Test_Testcases.cfg
index f61bb82..b44a70c 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_Testcases.cfg
+++ b/test/LGenBase/EPTF_LGenBase_Test_Testcases.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 [MODULE_PARAMETERS]
diff --git a/test/LGenBase/EPTF_LGenBase_Test_Testcases.ttcn b/test/LGenBase/EPTF_LGenBase_Test_Testcases.ttcn
index 2daf826..4d30336 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_Testcases.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR10.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR10.ttcn
index 693368e..9d3ae4a 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR10.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR10.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR11.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR11.ttcn
index 6c0aba5..98472ca 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR11.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR11.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR12.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR12.ttcn
index d22a1cb..eca4693 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR12.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR12.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR13.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR13.ttcn
index 994540f..b39f380 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR13.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR13.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR14.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR14.ttcn
index 6517d75..6fcd0d5 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR14.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR14.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR18.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR18.ttcn
index adf2b64..9e3d813 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR18.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR18.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR3.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR3.ttcn
index 9c9786a..af2c489 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR3.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR3.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR4.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR4.ttcn
index b6726b1..4ed4694 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR4.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR4.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR7.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR7.ttcn
index 8dcca5b..eb852f2 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR7.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR7.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR8.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR8.ttcn
index dbf0b71..0b58414 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR8.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR8.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR9.ttcn b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR9.ttcn
index f6f0edd..435350f 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_TestcasesR9.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_TestcasesR9.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/EPTF_LGenBase_Test_Testcases_Latest.ttcn b/test/LGenBase/EPTF_LGenBase_Test_Testcases_Latest.ttcn
index 35c5c3e..c9999f5 100644
--- a/test/LGenBase/EPTF_LGenBase_Test_Testcases_Latest.ttcn
+++ b/test/LGenBase/EPTF_LGenBase_Test_Testcases_Latest.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/LGenBaseStatsUI.cfg b/test/LGenBase/LGenBaseStatsUI.cfg
index e4d1bc0..ebcc8ab 100644
--- a/test/LGenBase/LGenBaseStatsUI.cfg
+++ b/test/LGenBase/LGenBaseStatsUI.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 # This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
 
diff --git a/test/LGenBase/LGenBaseStatsUI_Test.ttcn b/test/LGenBase/LGenBaseStatsUI_Test.ttcn
index 9b3958d..3980fd8 100644
--- a/test/LGenBase/LGenBaseStatsUI_Test.ttcn
+++ b/test/LGenBase/LGenBaseStatsUI_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASDefinitions.ttcn b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASDefinitions.ttcn
index b2b4c2d..50ee596 100755
--- a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASDefinitions.ttcn
+++ b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASFunctions.ttcnpp b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASFunctions.ttcnpp
index 37daed6..6805943 100644
--- a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASFunctions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTASFunctions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCDefinitions.ttcnpp b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCDefinitions.ttcnpp
index ab065bb..ec81e53 100644
--- a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCDefinitions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCDefinitions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCFunctions.ttcnpp b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCFunctions.ttcnpp
index aef794a..b4930f1 100644
--- a/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCFunctions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/EPTF_LGenBasePerformTest_MTCFunctions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTest.grp b/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTest.grp
index cbe9353..42b7f44 100644
--- a/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTest.grp
+++ b/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTest.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTests.ttcnpp b/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTests.ttcnpp
index 4cc7931..39dcf50 100644
--- a/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTests.ttcnpp
+++ b/test/LGenBase/PerformanceTests/EPTF_LGenBase_PerformanceTests.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Definitions.ttcn b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Definitions.ttcn
index df10562..6b7693f 100644
--- a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Definitions.ttcn
+++ b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Functions.ttcn b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Functions.ttcn
index da3fa33..46b8d05 100644
--- a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Functions.ttcn
+++ b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_TestCases.ttcn b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_TestCases.ttcn
index 4c38d95..9e7d407 100644
--- a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_TestCases.ttcn
+++ b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerfTest_FSM_TestCases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerformanceTest_FSM.grp b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerformanceTest_FSM.grp
index c26cc06..a501878 100644
--- a/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerformanceTest_FSM.grp
+++ b/test/LGenBase/PerformanceTests/FSMTest/EPTF_LGenBase_PerformanceTest_FSM.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/LGenBase/PerformanceTests/LGenBaseRegressionTests.cfg b/test/LGenBase/PerformanceTests/LGenBaseRegressionTests.cfg
index 80e24dd..66a1fcd 100755
--- a/test/LGenBase/PerformanceTests/LGenBaseRegressionTests.cfg
+++ b/test/LGenBase/PerformanceTests/LGenBaseRegressionTests.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_EPTF_cpsUpdateInterval := 0.005
diff --git a/test/LGenBase/PerformanceTests/LGenBase_PerformanceTest.cfg b/test/LGenBase/PerformanceTests/LGenBase_PerformanceTest.cfg
index 20e2bc0..b120256 100755
--- a/test/LGenBase/PerformanceTests/LGenBase_PerformanceTest.cfg
+++ b/test/LGenBase/PerformanceTests/LGenBase_PerformanceTest.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 //*Regression tests
 [INCLUDE]
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_CompareEventDispatchTypes.ttcn b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_CompareEventDispatchTypes.ttcn
index ce8db30..222a4b1 100644
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_CompareEventDispatchTypes.ttcn
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_CompareEventDispatchTypes.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenDefinitions.ttcn b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenDefinitions.ttcn
index 85bbe37..d76e4f3 100755
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenDefinitions.ttcn
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenDefinitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenFunctions.ttcnpp b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenFunctions.ttcnpp
index 97356ff..1394723 100644
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenFunctions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadLGenFunctions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMTCDefinitions.ttcnpp b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMTCDefinitions.ttcnpp
index c2c1d0b..39ded75 100644
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMTCDefinitions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMTCDefinitions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMessages.ttcnpp b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMessages.ttcnpp
index 747df64..44dc27e 100644
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMessages.ttcnpp
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadMessages.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestCPS.ttcnpp b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestCPS.ttcnpp
index c773aab..42e361a 100644
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestCPS.ttcnpp
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestCPS.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestResources.ttcnpp b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestResources.ttcnpp
index 8781360..52b00fa 100644
--- a/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestResources.ttcnpp
+++ b/test/LGenBase/PerformanceTests/LoadTest/EPTF_LGenBasePerformTest_LoadTestResources.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenDefinitions.ttcnpp b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenDefinitions.ttcnpp
index 2d390ee..8069829 100644
--- a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenDefinitions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenDefinitions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenFunctions.ttcnpp b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenFunctions.ttcnpp
index e4ddad9..3052b8f 100644
--- a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenFunctions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemLoadgenFunctions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCDefinitions.ttcnpp b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCDefinitions.ttcnpp
index 18e96cf..16ae2db 100644
--- a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCDefinitions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCDefinitions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCFunctions.ttcnpp b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCFunctions.ttcnpp
index 15b9ff6..0584259 100644
--- a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCFunctions.ttcnpp
+++ b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMTCFunctions.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMessages.ttcnpp b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMessages.ttcnpp
index f9d6460..f7bcd73 100644
--- a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMessages.ttcnpp
+++ b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemMessages.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemTestCases.ttcnpp b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemTestCases.ttcnpp
index 0209bd9..24ea056 100644
--- a/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemTestCases.ttcnpp
+++ b/test/LGenBase/PerformanceTests/MemUsage/EPTF_LGenBasePerformTest_MemTestCases.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/PerformanceTests/PerfTestPatchR3.sh b/test/LGenBase/PerformanceTests/PerfTestPatchR3.sh
index 649953b..48fc72b 100755
--- a/test/LGenBase/PerformanceTests/PerfTestPatchR3.sh
+++ b/test/LGenBase/PerformanceTests/PerfTestPatchR3.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = -DR3/g
 s/-lxml2/-lxml2  -lutil/g' < $1 > $2
diff --git a/test/LGenBase/PerformanceTests/storePerformanceResults.sh b/test/LGenBase/PerformanceTests/storePerformanceResults.sh
index 57f5d38..a92f9ee 100755
--- a/test/LGenBase/PerformanceTests/storePerformanceResults.sh
+++ b/test/LGenBase/PerformanceTests/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 CURRENT_TIME=`date '+%Y-%m-%d %H:%M:%S'`
diff --git a/test/LGenBase/makefile_patch.sh b/test/LGenBase/makefile_patch.sh
index 1456952..8db3c52 100755
--- a/test/LGenBase/makefile_patch.sh
+++ b/test/LGenBase/makefile_patch.sh
@@ -3,8 +3,8 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e 's/LINUX_LIBS =/LINUX_LIBS = -lutil/g' <$1 >$2
diff --git a/test/LGenBase/paramDemoAppLib_Definitions.ttcn b/test/LGenBase/paramDemoAppLib_Definitions.ttcn
index b846682..db802e2 100644
--- a/test/LGenBase/paramDemoAppLib_Definitions.ttcn
+++ b/test/LGenBase/paramDemoAppLib_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/paramDemoAppLib_Functions.ttcn b/test/LGenBase/paramDemoAppLib_Functions.ttcn
index 8009692..db17107 100644
--- a/test/LGenBase/paramDemoAppLib_Functions.ttcn
+++ b/test/LGenBase/paramDemoAppLib_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LGenBase/smokeTests.txt b/test/LGenBase/smokeTests.txt
index a6a9cf0..815f211 100644
--- a/test/LGenBase/smokeTests.txt
+++ b/test/LGenBase/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_LGenBase_Test_Testcases.tc_EPTF_LGenBase_Test_trafficSuccess
 EPTF_LGenBase_Test_Testcases.tc_EPTF_LGenBase_Test_trafficFailed
diff --git a/test/LoadRegulator/EPTF_CLL_LoadRegulator_XML.xml b/test/LoadRegulator/EPTF_CLL_LoadRegulator_XML.xml
index eb4c81d..2b0e2fb 100644
--- a/test/LoadRegulator/EPTF_CLL_LoadRegulator_XML.xml
+++ b/test/LoadRegulator/EPTF_CLL_LoadRegulator_XML.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/test/LoadRegulator/EPTF_LoadRegulator_Test.cfg b/test/LoadRegulator/EPTF_LoadRegulator_Test.cfg
index 93d4e88..07bc047 100644
--- a/test/LoadRegulator/EPTF_LoadRegulator_Test.cfg
+++ b/test/LoadRegulator/EPTF_LoadRegulator_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/LoadRegulator/EPTF_LoadRegulator_Test.prj b/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
index 7dcdeec..631a02d 100644
--- a/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
+++ b/test/LoadRegulator/EPTF_LoadRegulator_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/LoadRegulator/EPTF_LoadRegulator_Test.tpd b/test/LoadRegulator/EPTF_LoadRegulator_Test.tpd
index 98b980d..b994137 100644
--- a/test/LoadRegulator/EPTF_LoadRegulator_Test.tpd
+++ b/test/LoadRegulator/EPTF_LoadRegulator_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/LoadRegulator/EPTF_LoadRegulator_Test.ttcn b/test/LoadRegulator/EPTF_LoadRegulator_Test.ttcn
index 8e7b792..7538ebb 100644
--- a/test/LoadRegulator/EPTF_LoadRegulator_Test.ttcn
+++ b/test/LoadRegulator/EPTF_LoadRegulator_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/LoadRegulator/smokeTests.txt b/test/LoadRegulator/smokeTests.txt
index cb0882e..f836957 100644
--- a/test/LoadRegulator/smokeTests.txt
+++ b/test/LoadRegulator/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_LoadRegulator_Test.tc_EPTF_LoadRegulator_Test_init_CT
 EPTF_LoadRegulator_Test.tc_EPTF_LoadRegulator_Test_exponentialSmoothingFunction
diff --git a/test/Logging/EPTF_LoggingDSGUI_Test.prj b/test/Logging/EPTF_LoggingDSGUI_Test.prj
index cd2dd8c..0049487 100644
--- a/test/Logging/EPTF_LoggingDSGUI_Test.prj
+++ b/test/Logging/EPTF_LoggingDSGUI_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Logging/EPTF_LoggingDSGUI_Test.tpd b/test/Logging/EPTF_LoggingDSGUI_Test.tpd
index 3837c8c..2ce4ec3 100644
--- a/test/Logging/EPTF_LoggingDSGUI_Test.tpd
+++ b/test/Logging/EPTF_LoggingDSGUI_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Logging/EPTF_LoggingDSGUI_TestCases.ttcn b/test/Logging/EPTF_LoggingDSGUI_TestCases.ttcn
index 061d9a6..8cd95fd 100644
--- a/test/Logging/EPTF_LoggingDSGUI_TestCases.ttcn
+++ b/test/Logging/EPTF_LoggingDSGUI_TestCases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Logging/EPTF_LoggingDSGUI_test.cfg b/test/Logging/EPTF_LoggingDSGUI_test.cfg
index 4ee8bb7..01f79a9 100644
--- a/test/Logging/EPTF_LoggingDSGUI_test.cfg
+++ b/test/Logging/EPTF_LoggingDSGUI_test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_EPTF_Var_SyncInterval := 1.0
diff --git a/test/Logging/EPTF_LoggingDS_Test.prj b/test/Logging/EPTF_LoggingDS_Test.prj
index d0889fb..8609102 100644
--- a/test/Logging/EPTF_LoggingDS_Test.prj
+++ b/test/Logging/EPTF_LoggingDS_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Logging/EPTF_LoggingDS_Test.tpd b/test/Logging/EPTF_LoggingDS_Test.tpd
index 3070d3d..54b27c2 100644
--- a/test/Logging/EPTF_LoggingDS_Test.tpd
+++ b/test/Logging/EPTF_LoggingDS_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Logging/EPTF_LoggingDS_TestCases.ttcn b/test/Logging/EPTF_LoggingDS_TestCases.ttcn
index e54269c..bb26445 100644
--- a/test/Logging/EPTF_LoggingDS_TestCases.ttcn
+++ b/test/Logging/EPTF_LoggingDS_TestCases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Logging/EPTF_LoggingDS_test.cfg b/test/Logging/EPTF_LoggingDS_test.cfg
index 6af6629..e55d72b 100644
--- a/test/Logging/EPTF_LoggingDS_test.cfg
+++ b/test/Logging/EPTF_LoggingDS_test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/test/Logging/EPTF_LoggingUI_Test.tpd b/test/Logging/EPTF_LoggingUI_Test.tpd
index 7839ce8..e1fb40b 100644
--- a/test/Logging/EPTF_LoggingUI_Test.tpd
+++ b/test/Logging/EPTF_LoggingUI_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Logging/EPTF_LoggingUI_Test_disabled.prj b/test/Logging/EPTF_LoggingUI_Test_disabled.prj
index d83c478..2a664e4 100644
--- a/test/Logging/EPTF_LoggingUI_Test_disabled.prj
+++ b/test/Logging/EPTF_LoggingUI_Test_disabled.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Logging/EPTF_LoggingUI_test.cfg b/test/Logging/EPTF_LoggingUI_test.cfg
index 30250dd..e557ec9 100644
--- a/test/Logging/EPTF_LoggingUI_test.cfg
+++ b/test/Logging/EPTF_LoggingUI_test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_EPTF_Var_SyncInterval := 1.0
diff --git a/test/Logging/EPTF_LoggingUI_test.ttcn b/test/Logging/EPTF_LoggingUI_test.ttcn
index 19517f9..0d0248f 100644
--- a/test/Logging/EPTF_LoggingUI_test.ttcn
+++ b/test/Logging/EPTF_LoggingUI_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Logging/EPTF_Logging_Test.prj b/test/Logging/EPTF_Logging_Test.prj
index 27b408f..07bf52c 100644
--- a/test/Logging/EPTF_Logging_Test.prj
+++ b/test/Logging/EPTF_Logging_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Logging/EPTF_Logging_Test.tpd b/test/Logging/EPTF_Logging_Test.tpd
index 3b93ded..ba96f8e 100644
--- a/test/Logging/EPTF_Logging_Test.tpd
+++ b/test/Logging/EPTF_Logging_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Logging/EPTF_Logging_test.cfg b/test/Logging/EPTF_Logging_test.cfg
index 1f6bd6d..43351e1 100644
--- a/test/Logging/EPTF_Logging_test.cfg
+++ b/test/Logging/EPTF_Logging_test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/test/Logging/EPTF_Logging_test.ttcn b/test/Logging/EPTF_Logging_test.ttcn
index 870dd4e..a688d06 100644
--- a/test/Logging/EPTF_Logging_test.ttcn
+++ b/test/Logging/EPTF_Logging_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Logging/TCCUsefulFunctions.grp b/test/Logging/TCCUsefulFunctions.grp
index 22561ef..8a95594 100644
--- a/test/Logging/TCCUsefulFunctions.grp
+++ b/test/Logging/TCCUsefulFunctions.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/Logging/TELNETasp.grp b/test/Logging/TELNETasp.grp
index 5fff97b..12f77da 100644
--- a/test/Logging/TELNETasp.grp
+++ b/test/Logging/TELNETasp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/Logging/gui.xml b/test/Logging/gui.xml
index 2a237ca..f536617 100644
--- a/test/Logging/gui.xml
+++ b/test/Logging/gui.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns="http://ttcn.ericsson.se/protocolModules/xtdp/xtdl">
diff --git a/test/Logging/smokeTests.txt b/test/Logging/smokeTests.txt
index 3b0df5e..489a8ac 100644
--- a/test/Logging/smokeTests.txt
+++ b/test/Logging/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Logging_test.tc_EPTF_Logging_test1
 EPTF_Logging_test.tc_EPTF_Logging_test2
diff --git a/test/Logging/smokeTestsUI.txt b/test/Logging/smokeTestsUI.txt
index eef0b0b..bfcd969 100644
--- a/test/Logging/smokeTestsUI.txt
+++ b/test/Logging/smokeTestsUI.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 LoggingUI_test.tc_LoggingUI_logTest
 LoggingUI_test.tc_LoggingUI_functionTest
diff --git a/test/NQueue/EPTF_NQueue_Test.cfg b/test/NQueue/EPTF_NQueue_Test.cfg
index 7648d1e..e8e1351 100644
--- a/test/NQueue/EPTF_NQueue_Test.cfg
+++ b/test/NQueue/EPTF_NQueue_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #tsp_CLL_debug_acceptableMaxSizeOfGrowingVariables := 10;
diff --git a/test/NQueue/EPTF_NQueue_Test.prj b/test/NQueue/EPTF_NQueue_Test.prj
index e156eac..9a9dbc4 100644
--- a/test/NQueue/EPTF_NQueue_Test.prj
+++ b/test/NQueue/EPTF_NQueue_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/NQueue/EPTF_NQueue_Test.tpd b/test/NQueue/EPTF_NQueue_Test.tpd
index d552089..039a114 100644
--- a/test/NQueue/EPTF_NQueue_Test.tpd
+++ b/test/NQueue/EPTF_NQueue_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/NQueue/EPTF_NQueue_Test.ttcn b/test/NQueue/EPTF_NQueue_Test.ttcn
index cc5d9fb..193cb35 100644
--- a/test/NQueue/EPTF_NQueue_Test.ttcn
+++ b/test/NQueue/EPTF_NQueue_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 ///////////////////////////////////////////////////////////

diff --git a/test/NQueue/smokeTests.txt b/test/NQueue/smokeTests.txt
index f6c68db..a709ab0 100644
--- a/test/NQueue/smokeTests.txt
+++ b/test/NQueue/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_NQueue_Test.tc_EPTF_NQueue_Test_createNewItem1
 EPTF_NQueue_Test.tc_EPTF_NQueue_Test_createNewItem2
diff --git a/test/NameService/EPTF_NameService_Test.cfg b/test/NameService/EPTF_NameService_Test.cfg
index f098155..12a2a3c 100644
--- a/test/NameService/EPTF_NameService_Test.cfg
+++ b/test/NameService/EPTF_NameService_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL | TTCN_DEBUG
diff --git a/test/NameService/EPTF_NameService_Test.prj b/test/NameService/EPTF_NameService_Test.prj
index 529da59..ab65946 100644
--- a/test/NameService/EPTF_NameService_Test.prj
+++ b/test/NameService/EPTF_NameService_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/NameService/EPTF_NameService_Test.tpd b/test/NameService/EPTF_NameService_Test.tpd
index 6c07f86..261e2f0 100644
--- a/test/NameService/EPTF_NameService_Test.tpd
+++ b/test/NameService/EPTF_NameService_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/NameService/EPTF_NameService_Test_Definitions.ttcn b/test/NameService/EPTF_NameService_Test_Definitions.ttcn
index ed51b36..2233790 100644
--- a/test/NameService/EPTF_NameService_Test_Definitions.ttcn
+++ b/test/NameService/EPTF_NameService_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/NameService/EPTF_NameService_Test_Functions.ttcn b/test/NameService/EPTF_NameService_Test_Functions.ttcn
index 3282482..416653d 100644
--- a/test/NameService/EPTF_NameService_Test_Functions.ttcn
+++ b/test/NameService/EPTF_NameService_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/NameService/EPTF_NameService_Test_Testcases.ttcn b/test/NameService/EPTF_NameService_Test_Testcases.ttcn
index a9142ca..f40acf7 100644
--- a/test/NameService/EPTF_NameService_Test_Testcases.ttcn
+++ b/test/NameService/EPTF_NameService_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/NameService/smokeTests.txt b/test/NameService/smokeTests.txt
index ef8a554..0592ddf 100644
--- a/test/NameService/smokeTests.txt
+++ b/test/NameService/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_NameService_Test_Testcases.tc_EPTF_NS_test
 EPTF_NameService_Test_Testcases.tc_EPTF_NS_Test_init_CT
diff --git a/test/PTCDeployment/EPTF_PTCDeployment_Test.cfg b/test/PTCDeployment/EPTF_PTCDeployment_Test.cfg
index b5a2805..52fa29e 100644
--- a/test/PTCDeployment/EPTF_PTCDeployment_Test.cfg
+++ b/test/PTCDeployment/EPTF_PTCDeployment_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL | TTCN_DEBUG
diff --git a/test/PTCDeployment/EPTF_PTCDeployment_Test.prj b/test/PTCDeployment/EPTF_PTCDeployment_Test.prj
index 3c64af9..2de6ab0 100644
--- a/test/PTCDeployment/EPTF_PTCDeployment_Test.prj
+++ b/test/PTCDeployment/EPTF_PTCDeployment_Test.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/PTCDeployment/EPTF_PTCDeployment_Test.tpd b/test/PTCDeployment/EPTF_PTCDeployment_Test.tpd
index 2fc71db..f4e8826 100644
--- a/test/PTCDeployment/EPTF_PTCDeployment_Test.tpd
+++ b/test/PTCDeployment/EPTF_PTCDeployment_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/PTCDeployment/EPTF_PTCDeployment_Test_Testcases.ttcn b/test/PTCDeployment/EPTF_PTCDeployment_Test_Testcases.ttcn
index eee4438..bcfb29e 100644
--- a/test/PTCDeployment/EPTF_PTCDeployment_Test_Testcases.ttcn
+++ b/test/PTCDeployment/EPTF_PTCDeployment_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/PTCDeployment/smokeTests.txt b/test/PTCDeployment/smokeTests.txt
index 7cb2853..a885e1d 100644
--- a/test/PTCDeployment/smokeTests.txt
+++ b/test/PTCDeployment/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_PTCD_Test_Testcases.tc
 EPTF_PTCD_Test_Testcases.tc_EPTF_PTCD_Test_init_CT
diff --git a/test/RandomNArray/EPTF_RNA.cfg b/test/RandomNArray/EPTF_RNA.cfg
index 0a9ef0d..0c091ca 100644
--- a/test/RandomNArray/EPTF_RNA.cfg
+++ b/test/RandomNArray/EPTF_RNA.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/test/RandomNArray/EPTF_RNA_Test.prj b/test/RandomNArray/EPTF_RNA_Test.prj
index 03ddb9a..d306fa6 100644
--- a/test/RandomNArray/EPTF_RNA_Test.prj
+++ b/test/RandomNArray/EPTF_RNA_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/RandomNArray/EPTF_RNA_Test.tpd b/test/RandomNArray/EPTF_RNA_Test.tpd
index 3cf1a85..e75da1e 100644
--- a/test/RandomNArray/EPTF_RNA_Test.tpd
+++ b/test/RandomNArray/EPTF_RNA_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/RandomNArray/EPTF_RNA_Test.ttcn b/test/RandomNArray/EPTF_RNA_Test.ttcn
index 0958340..2657dca 100644
--- a/test/RandomNArray/EPTF_RNA_Test.ttcn
+++ b/test/RandomNArray/EPTF_RNA_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/RandomNArray/smokeTests.txt b/test/RandomNArray/smokeTests.txt
index b55b9d8..8796134 100644
--- a/test/RandomNArray/smokeTests.txt
+++ b/test/RandomNArray/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_RNA_Test.tc_getlist_RNA
 EPTF_RNA_Test.tc_itemIsFree_RFBA  
diff --git a/test/RedBlackTree/EPTF_RBT_Test.cfg b/test/RedBlackTree/EPTF_RBT_Test.cfg
index 8780269..b2004ea 100644
--- a/test/RedBlackTree/EPTF_RBT_Test.cfg
+++ b/test/RedBlackTree/EPTF_RBT_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/RedBlackTree/EPTF_RBT_Test.prj b/test/RedBlackTree/EPTF_RBT_Test.prj
index 50b879f..a5c163f 100644
--- a/test/RedBlackTree/EPTF_RBT_Test.prj
+++ b/test/RedBlackTree/EPTF_RBT_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/RedBlackTree/EPTF_RBT_Test.tpd b/test/RedBlackTree/EPTF_RBT_Test.tpd
index d49849a..96d504f 100644
--- a/test/RedBlackTree/EPTF_RBT_Test.tpd
+++ b/test/RedBlackTree/EPTF_RBT_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/RedBlackTree/EPTF_RBT_Test.ttcn b/test/RedBlackTree/EPTF_RBT_Test.ttcn
index 64acad4..f694457 100644
--- a/test/RedBlackTree/EPTF_RBT_Test.ttcn
+++ b/test/RedBlackTree/EPTF_RBT_Test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_RBT_Test
 {
diff --git a/test/RedBlackTree/smokeTests.txt b/test/RedBlackTree/smokeTests.txt
index e3cf0a9..6b409cc 100644
--- a/test/RedBlackTree/smokeTests.txt
+++ b/test/RedBlackTree/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_RBT_Test.tc_RBT_Test_testIntegerRBTGrowage
 EPTF_RBT_Test.tc_RBT_Test_testFloatRBTGrowage
diff --git a/test/Rendezvous/EPTF_Rendezvous_Test.prj b/test/Rendezvous/EPTF_Rendezvous_Test.prj
index bc00401..62157bc 100644
--- a/test/Rendezvous/EPTF_Rendezvous_Test.prj
+++ b/test/Rendezvous/EPTF_Rendezvous_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Rendezvous/EPTF_Rendezvous_Test.tpd b/test/Rendezvous/EPTF_Rendezvous_Test.tpd
index 2dad4c3..e151702 100644
--- a/test/Rendezvous/EPTF_Rendezvous_Test.tpd
+++ b/test/Rendezvous/EPTF_Rendezvous_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Rendezvous/EPTF_Rendezvous_test.ttcn b/test/Rendezvous/EPTF_Rendezvous_test.ttcn
index 42c7c4a..fcdccb3 100644
--- a/test/Rendezvous/EPTF_Rendezvous_test.ttcn
+++ b/test/Rendezvous/EPTF_Rendezvous_test.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Rendezvous/Rendezvous.cfg b/test/Rendezvous/Rendezvous.cfg
index 3f0614a..ba03fe3 100644
--- a/test/Rendezvous/Rendezvous.cfg
+++ b/test/Rendezvous/Rendezvous.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/test/Rendezvous/smokeTests.txt b/test/Rendezvous/smokeTests.txt
index 865b529..b516d48 100644
--- a/test/Rendezvous/smokeTests.txt
+++ b/test/Rendezvous/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Rendezvous_test.tc_EPTF_Rendezvous_BaseTest
 EPTF_Rendezvous_test.tc_EPTF_Rendezvous_BaseTestWithSemaphore
diff --git a/test/RingBuffer/EPTF_RingBuffer_Test.cfg b/test/RingBuffer/EPTF_RingBuffer_Test.cfg
index 9b1e613..01d8755 100755
--- a/test/RingBuffer/EPTF_RingBuffer_Test.cfg
+++ b/test/RingBuffer/EPTF_RingBuffer_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/RingBuffer/EPTF_RingBuffer_Test.tpd b/test/RingBuffer/EPTF_RingBuffer_Test.tpd
index 4575f55..8745612 100644
--- a/test/RingBuffer/EPTF_RingBuffer_Test.tpd
+++ b/test/RingBuffer/EPTF_RingBuffer_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/RingBuffer/GenericRingBuffer_TestCases.ttcnpp b/test/RingBuffer/GenericRingBuffer_TestCases.ttcnpp
index a77ad41..2777309 100644
--- a/test/RingBuffer/GenericRingBuffer_TestCases.ttcnpp
+++ b/test/RingBuffer/GenericRingBuffer_TestCases.ttcnpp
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 module GenericRingBuffer_TestCases

diff --git a/test/RingBuffer/IntegerRingBuffer_TestCases.ttcn b/test/RingBuffer/IntegerRingBuffer_TestCases.ttcn
index 51a99d1..851c4db 100644
--- a/test/RingBuffer/IntegerRingBuffer_TestCases.ttcn
+++ b/test/RingBuffer/IntegerRingBuffer_TestCases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 

 module IntegerRingBuffer_TestCases

diff --git a/test/RingBuffer/RingBuffer_Test.prj b/test/RingBuffer/RingBuffer_Test.prj
index c12071f..9c53c1e 100644
--- a/test/RingBuffer/RingBuffer_Test.prj
+++ b/test/RingBuffer/RingBuffer_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/RingBuffer/smokeTests.txt b/test/RingBuffer/smokeTests.txt
index 16cfc13..5e1a079 100644
--- a/test/RingBuffer/smokeTests.txt
+++ b/test/RingBuffer/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 GenericRingBuffer_TestCases.tc_GRB_init
 GenericRingBuffer_TestCases.tc_GRB_size
diff --git a/test/SMacro/EPTF_SMacro_PerfTest.cfg b/test/SMacro/EPTF_SMacro_PerfTest.cfg
index 5230177..d21d22c 100644
--- a/test/SMacro/EPTF_SMacro_PerfTest.cfg
+++ b/test/SMacro/EPTF_SMacro_PerfTest.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/SMacro/EPTF_SMacro_PerfTest.prj b/test/SMacro/EPTF_SMacro_PerfTest.prj
index 839c05e..4dc479d 100644
--- a/test/SMacro/EPTF_SMacro_PerfTest.prj
+++ b/test/SMacro/EPTF_SMacro_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/SMacro/EPTF_SMacro_PerfTest.tpd b/test/SMacro/EPTF_SMacro_PerfTest.tpd
index 9cd0226..81a5d20 100644
--- a/test/SMacro/EPTF_SMacro_PerfTest.tpd
+++ b/test/SMacro/EPTF_SMacro_PerfTest.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/SMacro/EPTF_SMacro_PerfTest_Definitions.ttcn b/test/SMacro/EPTF_SMacro_PerfTest_Definitions.ttcn
index b121828..b40b43e 100644
--- a/test/SMacro/EPTF_SMacro_PerfTest_Definitions.ttcn
+++ b/test/SMacro/EPTF_SMacro_PerfTest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/SMacro/EPTF_SMacro_PerfTest_Functions.ttcn b/test/SMacro/EPTF_SMacro_PerfTest_Functions.ttcn
index 69d38b7..da32e77 100644
--- a/test/SMacro/EPTF_SMacro_PerfTest_Functions.ttcn
+++ b/test/SMacro/EPTF_SMacro_PerfTest_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/SMacro/EPTF_SMacro_PerfTest_Testcases.ttcn b/test/SMacro/EPTF_SMacro_PerfTest_Testcases.ttcn
index 63d0ce8..12bfcfc 100644
--- a/test/SMacro/EPTF_SMacro_PerfTest_Testcases.ttcn
+++ b/test/SMacro/EPTF_SMacro_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/SMacro/EPTF_SMacro_Test.cfg b/test/SMacro/EPTF_SMacro_Test.cfg
index 48dabc1..cc27253 100644
--- a/test/SMacro/EPTF_SMacro_Test.cfg
+++ b/test/SMacro/EPTF_SMacro_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/SMacro/EPTF_SMacro_Test.prj b/test/SMacro/EPTF_SMacro_Test.prj
index c273f67..4ea7997 100644
--- a/test/SMacro/EPTF_SMacro_Test.prj
+++ b/test/SMacro/EPTF_SMacro_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/SMacro/EPTF_SMacro_Test.tpd b/test/SMacro/EPTF_SMacro_Test.tpd
index 329d8dc..bff833b 100644
--- a/test/SMacro/EPTF_SMacro_Test.tpd
+++ b/test/SMacro/EPTF_SMacro_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/SMacro/EPTF_SMacro_Test_Definitions.ttcn b/test/SMacro/EPTF_SMacro_Test_Definitions.ttcn
index 66c1b95..71c0801 100644
--- a/test/SMacro/EPTF_SMacro_Test_Definitions.ttcn
+++ b/test/SMacro/EPTF_SMacro_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/SMacro/EPTF_SMacro_Test_Functions.ttcn b/test/SMacro/EPTF_SMacro_Test_Functions.ttcn
index c5ac837..e1249b9 100644
--- a/test/SMacro/EPTF_SMacro_Test_Functions.ttcn
+++ b/test/SMacro/EPTF_SMacro_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/SMacro/EPTF_SMacro_Test_Testcases.ttcn b/test/SMacro/EPTF_SMacro_Test_Testcases.ttcn
index ccfe961..9d3a634 100644
--- a/test/SMacro/EPTF_SMacro_Test_Testcases.ttcn
+++ b/test/SMacro/EPTF_SMacro_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/SMacro/makefile_patch.sh b/test/SMacro/makefile_patch.sh
index 1456952..8db3c52 100755
--- a/test/SMacro/makefile_patch.sh
+++ b/test/SMacro/makefile_patch.sh
@@ -3,8 +3,8 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e 's/LINUX_LIBS =/LINUX_LIBS = -lutil/g' <$1 >$2
diff --git a/test/SMacro/storePerformanceResults.sh b/test/SMacro/storePerformanceResults.sh
index de29236..6de4a91 100755
--- a/test/SMacro/storePerformanceResults.sh
+++ b/test/SMacro/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # Add thich to the CFG file:
diff --git a/test/Scheduler/EPTF_Scheduler_PerfTest.cfg b/test/Scheduler/EPTF_Scheduler_PerfTest.cfg
index 63831b8..8a9293c 100644
--- a/test/Scheduler/EPTF_Scheduler_PerfTest.cfg
+++ b/test/Scheduler/EPTF_Scheduler_PerfTest.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Scheduler/EPTF_Scheduler_PerfTest.prj b/test/Scheduler/EPTF_Scheduler_PerfTest.prj
index 0cb90dd..77b0853 100644
--- a/test/Scheduler/EPTF_Scheduler_PerfTest.prj
+++ b/test/Scheduler/EPTF_Scheduler_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Scheduler/EPTF_Scheduler_PerfTest.tpd b/test/Scheduler/EPTF_Scheduler_PerfTest.tpd
index 1c1a08b..9e2431e 100644
--- a/test/Scheduler/EPTF_Scheduler_PerfTest.tpd
+++ b/test/Scheduler/EPTF_Scheduler_PerfTest.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Scheduler/EPTF_Scheduler_PerfTest_Definitions.ttcn b/test/Scheduler/EPTF_Scheduler_PerfTest_Definitions.ttcn
index ecebba8..af84f4a 100644
--- a/test/Scheduler/EPTF_Scheduler_PerfTest_Definitions.ttcn
+++ b/test/Scheduler/EPTF_Scheduler_PerfTest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Scheduler/EPTF_Scheduler_PerfTest_Functions.ttcn b/test/Scheduler/EPTF_Scheduler_PerfTest_Functions.ttcn
index 492a33e..314e5a0 100644
--- a/test/Scheduler/EPTF_Scheduler_PerfTest_Functions.ttcn
+++ b/test/Scheduler/EPTF_Scheduler_PerfTest_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Scheduler/EPTF_Scheduler_PerfTest_Testcases.ttcn b/test/Scheduler/EPTF_Scheduler_PerfTest_Testcases.ttcn
index 4e08bab..16213d8 100644
--- a/test/Scheduler/EPTF_Scheduler_PerfTest_Testcases.ttcn
+++ b/test/Scheduler/EPTF_Scheduler_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Scheduler/EPTF_Scheduler_Test.cfg b/test/Scheduler/EPTF_Scheduler_Test.cfg
index 04a5405..eaa44ab 100644
--- a/test/Scheduler/EPTF_Scheduler_Test.cfg
+++ b/test/Scheduler/EPTF_Scheduler_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 #ModuleName.SampleParameter := SampleValue
diff --git a/test/Scheduler/EPTF_Scheduler_Test.prj b/test/Scheduler/EPTF_Scheduler_Test.prj
index 56c437e..064ce09 100644
--- a/test/Scheduler/EPTF_Scheduler_Test.prj
+++ b/test/Scheduler/EPTF_Scheduler_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Scheduler/EPTF_Scheduler_Test.tpd b/test/Scheduler/EPTF_Scheduler_Test.tpd
index c752c2e..bbed6e2 100644
--- a/test/Scheduler/EPTF_Scheduler_Test.tpd
+++ b/test/Scheduler/EPTF_Scheduler_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Scheduler/EPTF_Scheduler_Test_Definitions.ttcn b/test/Scheduler/EPTF_Scheduler_Test_Definitions.ttcn
index 46e2bd5..31d69cc 100644
--- a/test/Scheduler/EPTF_Scheduler_Test_Definitions.ttcn
+++ b/test/Scheduler/EPTF_Scheduler_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Scheduler/EPTF_Scheduler_Test_Functions.ttcn b/test/Scheduler/EPTF_Scheduler_Test_Functions.ttcn
index 092f390..665b81b 100644
--- a/test/Scheduler/EPTF_Scheduler_Test_Functions.ttcn
+++ b/test/Scheduler/EPTF_Scheduler_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Scheduler/EPTF_Scheduler_Test_Testcases.ttcn b/test/Scheduler/EPTF_Scheduler_Test_Testcases.ttcn
index e1a46f6..665f99d 100644
--- a/test/Scheduler/EPTF_Scheduler_Test_Testcases.ttcn
+++ b/test/Scheduler/EPTF_Scheduler_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Scheduler/makefile_patch.sh b/test/Scheduler/makefile_patch.sh
index a75238e..1a6ace9 100755
--- a/test/Scheduler/makefile_patch.sh
+++ b/test/Scheduler/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e '
diff --git a/test/Scheduler/smokeTests.txt b/test/Scheduler/smokeTests.txt
index 56ca717..5bd6057 100644
--- a/test/Scheduler/smokeTests.txt
+++ b/test/Scheduler/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Scheduler_Test_Testcases.tc_EPTF_Scheduler_Test_demo
 EPTF_Scheduler_Test_Testcases.tc_EPTF_Scheduler_Test_timerReadSpeed
diff --git a/test/Scheduler/storePerformanceResults.sh b/test/Scheduler/storePerformanceResults.sh
index 0b0756d..74f5953 100755
--- a/test/Scheduler/storePerformanceResults.sh
+++ b/test/Scheduler/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # Add this to the CFG file:
diff --git a/test/Semaphore/EPTF_Semaphore_Test.cfg b/test/Semaphore/EPTF_Semaphore_Test.cfg
index 0a25bbc..40701cb 100644
--- a/test/Semaphore/EPTF_Semaphore_Test.cfg
+++ b/test/Semaphore/EPTF_Semaphore_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/Semaphore/EPTF_Semaphore_Test.prj b/test/Semaphore/EPTF_Semaphore_Test.prj
index 43b61ea..2b6c45e 100644
--- a/test/Semaphore/EPTF_Semaphore_Test.prj
+++ b/test/Semaphore/EPTF_Semaphore_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Semaphore/EPTF_Semaphore_Test.tpd b/test/Semaphore/EPTF_Semaphore_Test.tpd
index 477746c..3595787 100644
--- a/test/Semaphore/EPTF_Semaphore_Test.tpd
+++ b/test/Semaphore/EPTF_Semaphore_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Semaphore/EPTF_Semaphore_Test_Definitions.ttcn b/test/Semaphore/EPTF_Semaphore_Test_Definitions.ttcn
index ac565c8..1230f25 100644
--- a/test/Semaphore/EPTF_Semaphore_Test_Definitions.ttcn
+++ b/test/Semaphore/EPTF_Semaphore_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Semaphore/EPTF_Semaphore_Test_Functions.ttcn b/test/Semaphore/EPTF_Semaphore_Test_Functions.ttcn
index bce7d58..fd8659b 100644
--- a/test/Semaphore/EPTF_Semaphore_Test_Functions.ttcn
+++ b/test/Semaphore/EPTF_Semaphore_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Semaphore/EPTF_Semaphore_Test_Testcases.ttcn b/test/Semaphore/EPTF_Semaphore_Test_Testcases.ttcn
index 3667c65..7e85439 100644
--- a/test/Semaphore/EPTF_Semaphore_Test_Testcases.ttcn
+++ b/test/Semaphore/EPTF_Semaphore_Test_Testcases.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////
 
diff --git a/test/Semaphore/smokeTests.txt b/test/Semaphore/smokeTests.txt
index 47ba95a..493de75 100644
--- a/test/Semaphore/smokeTests.txt
+++ b/test/Semaphore/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Semaphore_Test_Testcases.tc_Semaphore_basicTest
 EPTF_Semaphore_Test_Testcases.tc_EPTF_Semaphore_Test_init_CT
diff --git a/test/StatCapture/EPTF_CLL_StatCapture_Test.tpd b/test/StatCapture/EPTF_CLL_StatCapture_Test.tpd
index 4eabf3d..d57364f 100644
--- a/test/StatCapture/EPTF_CLL_StatCapture_Test.tpd
+++ b/test/StatCapture/EPTF_CLL_StatCapture_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/StatCapture/EPTF_StatCapture_Test.cfg b/test/StatCapture/EPTF_StatCapture_Test.cfg
index 4a2ce64..33dd48d 100644
--- a/test/StatCapture/EPTF_StatCapture_Test.cfg
+++ b/test/StatCapture/EPTF_StatCapture_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 LogFile := "%e.%h-%r-%t.%s"
diff --git a/test/StatCapture/EPTF_StatCapture_Test.prj b/test/StatCapture/EPTF_StatCapture_Test.prj
index 973e978..d35b76e 100644
--- a/test/StatCapture/EPTF_StatCapture_Test.prj
+++ b/test/StatCapture/EPTF_StatCapture_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/StatCapture/EPTF_StatCapture_Test.tpd b/test/StatCapture/EPTF_StatCapture_Test.tpd
index eb061f1..1efd90b 100644
--- a/test/StatCapture/EPTF_StatCapture_Test.tpd
+++ b/test/StatCapture/EPTF_StatCapture_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/StatCapture/EPTF_StatCapture_Test_Definitions.ttcn b/test/StatCapture/EPTF_StatCapture_Test_Definitions.ttcn
index c2e2148..23298b9 100644
--- a/test/StatCapture/EPTF_StatCapture_Test_Definitions.ttcn
+++ b/test/StatCapture/EPTF_StatCapture_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/StatCapture/EPTF_StatCapture_Test_Functions.ttcn b/test/StatCapture/EPTF_StatCapture_Test_Functions.ttcn
index 7eeb27e..6bef98b 100644
--- a/test/StatCapture/EPTF_StatCapture_Test_Functions.ttcn
+++ b/test/StatCapture/EPTF_StatCapture_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/StatCapture/EPTF_StatCapture_Test_Testcases.ttcn b/test/StatCapture/EPTF_StatCapture_Test_Testcases.ttcn
index 1eee44a..734e976 100644
--- a/test/StatCapture/EPTF_StatCapture_Test_Testcases.ttcn
+++ b/test/StatCapture/EPTF_StatCapture_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/StatCapture/smokeTests.txt b/test/StatCapture/smokeTests.txt
index 4d32c3b..d4043b3 100644
--- a/test/StatCapture/smokeTests.txt
+++ b/test/StatCapture/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_StatCapture_Test_Testcases.tc_EPTF_StatCapture_Test_init
 EPTF_StatCapture_Test_Testcases.tc_EPTF_StatCapture_Test_get_time
diff --git a/test/StatHandler/EPTF_StatHandler_Test.cfg b/test/StatHandler/EPTF_StatHandler_Test.cfg
index 476c1df..4ddf284 100644
--- a/test/StatHandler/EPTF_StatHandler_Test.cfg
+++ b/test/StatHandler/EPTF_StatHandler_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 tsp_xtdp_listen_addr := "127.0.0.1"
diff --git a/test/StatHandler/EPTF_StatHandler_Test.prj b/test/StatHandler/EPTF_StatHandler_Test.prj
index cc85e30..78c8cf9 100644
--- a/test/StatHandler/EPTF_StatHandler_Test.prj
+++ b/test/StatHandler/EPTF_StatHandler_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/StatHandler/EPTF_StatHandler_Test.tpd b/test/StatHandler/EPTF_StatHandler_Test.tpd
index fdb16e4..718be17 100644
--- a/test/StatHandler/EPTF_StatHandler_Test.tpd
+++ b/test/StatHandler/EPTF_StatHandler_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/StatHandler/EPTF_StatHandler_Test_Definitions.ttcn b/test/StatHandler/EPTF_StatHandler_Test_Definitions.ttcn
index 75dce87..206d146 100644
--- a/test/StatHandler/EPTF_StatHandler_Test_Definitions.ttcn
+++ b/test/StatHandler/EPTF_StatHandler_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/StatHandler/EPTF_StatHandler_Test_Functions.ttcn b/test/StatHandler/EPTF_StatHandler_Test_Functions.ttcn
index 2d41bfd..5680e5c 100644
--- a/test/StatHandler/EPTF_StatHandler_Test_Functions.ttcn
+++ b/test/StatHandler/EPTF_StatHandler_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/StatHandler/EPTF_StatHandler_Test_Testcases.ttcn b/test/StatHandler/EPTF_StatHandler_Test_Testcases.ttcn
index e25bf24..b93c17a 100644
--- a/test/StatHandler/EPTF_StatHandler_Test_Testcases.ttcn
+++ b/test/StatHandler/EPTF_StatHandler_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/StatHandler/smokeTests.txt b/test/StatHandler/smokeTests.txt
index 35ec1d8..47cc636 100644
--- a/test/StatHandler/smokeTests.txt
+++ b/test/StatHandler/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_StatHandler_Test_Testcases.tc_StatHandler_testAutoDisconnect
 EPTF_StatHandler_Test_Testcases.tc_StatHandler_Test_GUI
diff --git a/test/StatHandler/stathandler_gui.xml b/test/StatHandler/stathandler_gui.xml
index dc49e30..a56f958 100644
--- a/test/StatHandler/stathandler_gui.xml
+++ b/test/StatHandler/stathandler_gui.xml
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <Widgets xmlns='http://ttcn.ericsson.se/protocolModules/xtdp/xtdl'>
diff --git a/test/StatManager/EPTF_StatManager_Test.cfg b/test/StatManager/EPTF_StatManager_Test.cfg
index 7426a8c..2ec5ed1 100644
--- a/test/StatManager/EPTF_StatManager_Test.cfg
+++ b/test/StatManager/EPTF_StatManager_Test.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/test/StatManager/EPTF_StatManager_Test.prj b/test/StatManager/EPTF_StatManager_Test.prj
index f645341..1d1152e 100644
--- a/test/StatManager/EPTF_StatManager_Test.prj
+++ b/test/StatManager/EPTF_StatManager_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/StatManager/EPTF_StatManager_Test.tpd b/test/StatManager/EPTF_StatManager_Test.tpd
index f051fd0..c6d9db1 100644
--- a/test/StatManager/EPTF_StatManager_Test.tpd
+++ b/test/StatManager/EPTF_StatManager_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/StatManager/EPTF_StatManager_Test_Definitions.ttcn b/test/StatManager/EPTF_StatManager_Test_Definitions.ttcn
index 7960a6b..21e83f7 100644
--- a/test/StatManager/EPTF_StatManager_Test_Definitions.ttcn
+++ b/test/StatManager/EPTF_StatManager_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatManager_Test_Definitions {
 
diff --git a/test/StatManager/EPTF_StatManager_Test_Functions.ttcn b/test/StatManager/EPTF_StatManager_Test_Functions.ttcn
index d2fda8d..e5ded48 100644
--- a/test/StatManager/EPTF_StatManager_Test_Functions.ttcn
+++ b/test/StatManager/EPTF_StatManager_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatManager_Test_Functions {
 
diff --git a/test/StatManager/EPTF_StatManager_Test_Testcases.ttcn b/test/StatManager/EPTF_StatManager_Test_Testcases.ttcn
index 91d02f6..ba078ef 100644
--- a/test/StatManager/EPTF_StatManager_Test_Testcases.ttcn
+++ b/test/StatManager/EPTF_StatManager_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatManager_Test_Testcases {
 
diff --git a/test/StatMeasure/EPTF_StatMeasure_Test.cfg b/test/StatMeasure/EPTF_StatMeasure_Test.cfg
index b201e14..daedbd4 100644
--- a/test/StatMeasure/EPTF_StatMeasure_Test.cfg
+++ b/test/StatMeasure/EPTF_StatMeasure_Test.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/test/StatMeasure/EPTF_StatMeasure_Test.prj b/test/StatMeasure/EPTF_StatMeasure_Test.prj
index 958c81e..42b6347 100644
--- a/test/StatMeasure/EPTF_StatMeasure_Test.prj
+++ b/test/StatMeasure/EPTF_StatMeasure_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/StatMeasure/EPTF_StatMeasure_Test.tpd b/test/StatMeasure/EPTF_StatMeasure_Test.tpd
index f838802..76f6575 100644
--- a/test/StatMeasure/EPTF_StatMeasure_Test.tpd
+++ b/test/StatMeasure/EPTF_StatMeasure_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/StatMeasure/EPTF_StatMeasure_Test_Definitions.ttcn b/test/StatMeasure/EPTF_StatMeasure_Test_Definitions.ttcn
index a057332..1ebda7d 100644
--- a/test/StatMeasure/EPTF_StatMeasure_Test_Definitions.ttcn
+++ b/test/StatMeasure/EPTF_StatMeasure_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatMeasure_Test_Definitions {
 
diff --git a/test/StatMeasure/EPTF_StatMeasure_Test_Functions.ttcn b/test/StatMeasure/EPTF_StatMeasure_Test_Functions.ttcn
index 4232646..46c6849 100644
--- a/test/StatMeasure/EPTF_StatMeasure_Test_Functions.ttcn
+++ b/test/StatMeasure/EPTF_StatMeasure_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatMeasure_Test_Functions {
 
diff --git a/test/StatMeasure/EPTF_StatMeasure_Test_Testcases.ttcn b/test/StatMeasure/EPTF_StatMeasure_Test_Testcases.ttcn
index b95b4ae..7fb1b53 100644
--- a/test/StatMeasure/EPTF_StatMeasure_Test_Testcases.ttcn
+++ b/test/StatMeasure/EPTF_StatMeasure_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_StatMeasure_Test_Testcases {
 
diff --git a/test/StatMeasure/smokeTests.txt b/test/StatMeasure/smokeTests.txt
index ece77a2..3b44dd4 100644
--- a/test/StatMeasure/smokeTests.txt
+++ b/test/StatMeasure/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_StatMeasure_Test_Testcases.tc_EPTF_StatMeasure_Test_complex
 EPTF_StatMeasure_Test_Testcases.tc_EPTF_StatMeasure_Test_custom
diff --git a/test/StatReplay/DefaultFile_2008-12-16_11.10.04.txt b/test/StatReplay/DefaultFile_2008-12-16_11.10.04.txt
index 64b3cda..f7326fe 100644
--- a/test/StatReplay/DefaultFile_2008-12-16_11.10.04.txt
+++ b/test/StatReplay/DefaultFile_2008-12-16_11.10.04.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 TimeStampBase: 2008-12-16-11:10:04.492809 0.081235
 CaptureFileVersion: 2.2
diff --git a/test/StatReplay/EPTF_StatReplay_Test.cfg b/test/StatReplay/EPTF_StatReplay_Test.cfg
index e56f6fb..55e4f1b 100755
--- a/test/StatReplay/EPTF_StatReplay_Test.cfg
+++ b/test/StatReplay/EPTF_StatReplay_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 LogFile := "%e.%h-%r-%t.%s"
diff --git a/test/StatReplay/EPTF_StatReplay_Test.prj b/test/StatReplay/EPTF_StatReplay_Test.prj
index 7be36fe..7858e1d 100644
--- a/test/StatReplay/EPTF_StatReplay_Test.prj
+++ b/test/StatReplay/EPTF_StatReplay_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/StatReplay/EPTF_StatReplay_Test.tpd b/test/StatReplay/EPTF_StatReplay_Test.tpd
index 8c1b613..68c4659 100644
--- a/test/StatReplay/EPTF_StatReplay_Test.tpd
+++ b/test/StatReplay/EPTF_StatReplay_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/StatReplay/testlog.txt b/test/StatReplay/testlog.txt
index 6d9cef2..5e24543 100755
--- a/test/StatReplay/testlog.txt
+++ b/test/StatReplay/testlog.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 TimeStampBase: 2007-11-29-10:18:19.412000 0.295000

 CaptureGroup["group1"]

diff --git a/test/TimeProfileEditor/EPTF_TPE_Test.cfg b/test/TimeProfileEditor/EPTF_TPE_Test.cfg
index bf68cc4..54601a3 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test.cfg
+++ b/test/TimeProfileEditor/EPTF_TPE_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 #FileMask := LOG_NOTHING
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test.prj b/test/TimeProfileEditor/EPTF_TPE_Test.prj
index 37e30e4..debdd55 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test.prj
+++ b/test/TimeProfileEditor/EPTF_TPE_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test.tpd b/test/TimeProfileEditor/EPTF_TPE_Test.tpd
index 39de0e1..2a15b89 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test.tpd
+++ b/test/TimeProfileEditor/EPTF_TPE_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test_Definitions.ttcn b/test/TimeProfileEditor/EPTF_TPE_Test_Definitions.ttcn
index df970a6..de8651e 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test_Definitions.ttcn
+++ b/test/TimeProfileEditor/EPTF_TPE_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test_Functions.ttcn b/test/TimeProfileEditor/EPTF_TPE_Test_Functions.ttcn
index 88ab14f..7730713 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test_Functions.ttcn
+++ b/test/TimeProfileEditor/EPTF_TPE_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test_Templates.ttcn b/test/TimeProfileEditor/EPTF_TPE_Test_Templates.ttcn
index 2100b7f..388d2b6 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test_Templates.ttcn
+++ b/test/TimeProfileEditor/EPTF_TPE_Test_Templates.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/TimeProfileEditor/EPTF_TPE_Test_Testcases.ttcn b/test/TimeProfileEditor/EPTF_TPE_Test_Testcases.ttcn
index f203d76..d34b6b7 100644
--- a/test/TimeProfileEditor/EPTF_TPE_Test_Testcases.ttcn
+++ b/test/TimeProfileEditor/EPTF_TPE_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/TimeProfileEditor/edited_time_profiles.cfg b/test/TimeProfileEditor/edited_time_profiles.cfg
index 2bd1aef..ba74562 100644
--- a/test/TimeProfileEditor/edited_time_profiles.cfg
+++ b/test/TimeProfileEditor/edited_time_profiles.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 
diff --git a/test/TimeProfileEditor/smokeTests.txt b/test/TimeProfileEditor/smokeTests.txt
index 7e044dd..cb7bd57 100644
--- a/test/TimeProfileEditor/smokeTests.txt
+++ b/test/TimeProfileEditor/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_TPE_Test_Testcases.tc_EPTF_TPE_Test_add_time_sequence
 EPTF_TPE_Test_Testcases.tc_EPTF_TPE_Test_change_time_sequence_properties_tree
diff --git a/test/Transport/EPTF_Transport_IPsecHandler_Test.cfg b/test/Transport/EPTF_Transport_IPsecHandler_Test.cfg
index dc39c35..ac1f727 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test.cfg
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL | TTCN_DEBUG
diff --git a/test/Transport/EPTF_Transport_IPsecHandler_Test.prj b/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
index 062b275..b66548c 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Transport/EPTF_Transport_IPsecHandler_Test_Definitions.ttcn b/test/Transport/EPTF_Transport_IPsecHandler_Test_Definitions.ttcn
index 1ce1b84..b417f40 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test_Definitions.ttcn
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test_Definitions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Transport_IPsecHandler_Test_Definitions {
 
diff --git a/test/Transport/EPTF_Transport_IPsecHandler_Test_Functions.ttcn b/test/Transport/EPTF_Transport_IPsecHandler_Test_Functions.ttcn
index 4379df7..80c6ca0 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test_Functions.ttcn
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test_Functions.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Transport_IPsecHandler_Test_Functions {
 
diff --git a/test/Transport/EPTF_Transport_IPsecHandler_Test_TestCases.ttcn b/test/Transport/EPTF_Transport_IPsecHandler_Test_TestCases.ttcn
index ac6deff..add83a1 100644
--- a/test/Transport/EPTF_Transport_IPsecHandler_Test_TestCases.ttcn
+++ b/test/Transport/EPTF_Transport_IPsecHandler_Test_TestCases.ttcn
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 module EPTF_Transport_IPsecHandler_TestCases {
 
diff --git a/test/Transport/EPTF_Transport_NonBlocking_Test.cfg b/test/Transport/EPTF_Transport_NonBlocking_Test.cfg
index 81a884a..58f8ed4 100644
--- a/test/Transport/EPTF_Transport_NonBlocking_Test.cfg
+++ b/test/Transport/EPTF_Transport_NonBlocking_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL | TTCN_DEBUG
diff --git a/test/Transport/EPTF_Transport_NonBlocking_Test.prj b/test/Transport/EPTF_Transport_NonBlocking_Test.prj
index 8372882..998a623 100644
--- a/test/Transport/EPTF_Transport_NonBlocking_Test.prj
+++ b/test/Transport/EPTF_Transport_NonBlocking_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Transport/EPTF_Transport_NonBlocking_Test.tpd b/test/Transport/EPTF_Transport_NonBlocking_Test.tpd
index 01f7f5d..cb72544 100644
--- a/test/Transport/EPTF_Transport_NonBlocking_Test.tpd
+++ b/test/Transport/EPTF_Transport_NonBlocking_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Transport/EPTF_Transport_PerfTest.cfg b/test/Transport/EPTF_Transport_PerfTest.cfg
index a82ed06..00e56e3 100644
--- a/test/Transport/EPTF_Transport_PerfTest.cfg
+++ b/test/Transport/EPTF_Transport_PerfTest.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := ACTION|WARNING|STATISTICS|VERDICTOP|TESTCASE #LOG_ALL | TTCN_DEBUG
diff --git a/test/Transport/EPTF_Transport_PerfTest.prj b/test/Transport/EPTF_Transport_PerfTest.prj
index d958da1..7a9d6ec 100644
--- a/test/Transport/EPTF_Transport_PerfTest.prj
+++ b/test/Transport/EPTF_Transport_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Transport/EPTF_Transport_PerfTest_ExternalFunctions.cc b/test/Transport/EPTF_Transport_PerfTest_ExternalFunctions.cc
index 02f2be1..2f761d3 100644
--- a/test/Transport/EPTF_Transport_PerfTest_ExternalFunctions.cc
+++ b/test/Transport/EPTF_Transport_PerfTest_ExternalFunctions.cc
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 #include "EPTF_Transport_PerfTest_Testcases.hh"
 
diff --git a/test/Transport/EPTF_Transport_PerfTest_Testcases.ttcn b/test/Transport/EPTF_Transport_PerfTest_Testcases.ttcn
index 7aed902..5b071e7 100644
--- a/test/Transport/EPTF_Transport_PerfTest_Testcases.ttcn
+++ b/test/Transport/EPTF_Transport_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Transport/EPTF_Transport_Test.cfg b/test/Transport/EPTF_Transport_Test.cfg
index 1dc9594..730366e 100644
--- a/test/Transport/EPTF_Transport_Test.cfg
+++ b/test/Transport/EPTF_Transport_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [LOGGING]
 FileMask := LOG_ALL | TTCN_DEBUG
diff --git a/test/Transport/EPTF_Transport_Test.prj b/test/Transport/EPTF_Transport_Test.prj
index 6433208..410fc86 100644
--- a/test/Transport/EPTF_Transport_Test.prj
+++ b/test/Transport/EPTF_Transport_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Transport/EPTF_Transport_Test.tpd b/test/Transport/EPTF_Transport_Test.tpd
index acb05a7..6d8a947 100644
--- a/test/Transport/EPTF_Transport_Test.tpd
+++ b/test/Transport/EPTF_Transport_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Transport/EPTF_Transport_Test_Definitions.ttcn b/test/Transport/EPTF_Transport_Test_Definitions.ttcn
index f6e08bb..07cb727 100644
--- a/test/Transport/EPTF_Transport_Test_Definitions.ttcn
+++ b/test/Transport/EPTF_Transport_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Transport/EPTF_Transport_Test_Functions.ttcn b/test/Transport/EPTF_Transport_Test_Functions.ttcn
index 9a96544..ee9c946 100644
--- a/test/Transport/EPTF_Transport_Test_Functions.ttcn
+++ b/test/Transport/EPTF_Transport_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Transport/EPTF_Transport_Test_Testcases.ttcn b/test/Transport/EPTF_Transport_Test_Testcases.ttcn
index c670844..fe715aa 100644
--- a/test/Transport/EPTF_Transport_Test_Testcases.ttcn
+++ b/test/Transport/EPTF_Transport_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Transport/EPTF_Transport_Test_perfTestcases.ttcn b/test/Transport/EPTF_Transport_Test_perfTestcases.ttcn
index 6aa05bc..16c3a14 100644
--- a/test/Transport/EPTF_Transport_Test_perfTestcases.ttcn
+++ b/test/Transport/EPTF_Transport_Test_perfTestcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Transport/makefile_patch.sh b/test/Transport/makefile_patch.sh
index 8b9315a..74eaa38 100755
--- a/test/Transport/makefile_patch.sh
+++ b/test/Transport/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/test/Transport/smokeTests.txt b/test/Transport/smokeTests.txt
index 5df7bc5..5f9c867 100644
--- a/test/Transport/smokeTests.txt
+++ b/test/Transport/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Transport_Test_Testcases.tc_EPTF_Routing_Test_init_CT
 EPTF_Transport_Test_Testcases.tc_EPTF_Routing_Test_processIncomingMessage
diff --git a/test/Transport/storePerformanceResults.sh b/test/Transport/storePerformanceResults.sh
index e33b210..a955969 100755
--- a/test/Transport/storePerformanceResults.sh
+++ b/test/Transport/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # Add thich to the CFG file:
diff --git a/test/UIHandler/BrowserGUI/TitanSimAbout.html b/test/UIHandler/BrowserGUI/TitanSimAbout.html
index f68f6de..c768a30 100644
--- a/test/UIHandler/BrowserGUI/TitanSimAbout.html
+++ b/test/UIHandler/BrowserGUI/TitanSimAbout.html
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html>
diff --git a/test/UIHandler/BrowserGUI/custom1.css b/test/UIHandler/BrowserGUI/custom1.css
index 99b2f0b..b73f14e 100644
--- a/test/UIHandler/BrowserGUI/custom1.css
+++ b/test/UIHandler/BrowserGUI/custom1.css
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 */
 /* CUSTOM1.CSS */
diff --git a/test/UIHandler/BrowserGUI/custom2.css b/test/UIHandler/BrowserGUI/custom2.css
index 7c3ce4f..235bfe6 100644
--- a/test/UIHandler/BrowserGUI/custom2.css
+++ b/test/UIHandler/BrowserGUI/custom2.css
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 */
 /* CUSTOM2.CSS */
diff --git a/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.cfg b/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.cfg
index 5e2ea4e..bba28b0 100644
--- a/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.cfg
+++ b/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.tpd b/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.tpd
index f2f5721..88979d8 100644
--- a/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.tpd
+++ b/test/UIHandler/EPTF_UIHandler_ExternalValue_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/UIHandler/EPTF_UIHandler_ExternalValue_Testcases.ttcn b/test/UIHandler/EPTF_UIHandler_ExternalValue_Testcases.ttcn
index 753eb21..6930c1a 100644
--- a/test/UIHandler/EPTF_UIHandler_ExternalValue_Testcases.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_ExternalValue_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.cfg b/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.cfg
index c63d10b..ca04cc6 100644
--- a/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.cfg
+++ b/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.tpd b/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.tpd
index a6cc48d..6d9f7db 100644
--- a/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.tpd
+++ b/test/UIHandler/EPTF_UIHandler_GUIVariables_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/UIHandler/EPTF_UIHandler_GUIVariables_Testcases.ttcn b/test/UIHandler/EPTF_UIHandler_GUIVariables_Testcases.ttcn
index dedf30c..eff749c 100644
--- a/test/UIHandler/EPTF_UIHandler_GUIVariables_Testcases.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_GUIVariables_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/UIHandler/EPTF_UIHandler_Test.cfg b/test/UIHandler/EPTF_UIHandler_Test.cfg
index 7cf5c02..5098112 100755
--- a/test/UIHandler/EPTF_UIHandler_Test.cfg
+++ b/test/UIHandler/EPTF_UIHandler_Test.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/test/UIHandler/EPTF_UIHandler_Test.grp b/test/UIHandler/EPTF_UIHandler_Test.grp
index 90eea3c..bb1a7ed 100644
--- a/test/UIHandler/EPTF_UIHandler_Test.grp
+++ b/test/UIHandler/EPTF_UIHandler_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/UIHandler/EPTF_UIHandler_Test.prj b/test/UIHandler/EPTF_UIHandler_Test.prj
index a931e4e..575416f 100644
--- a/test/UIHandler/EPTF_UIHandler_Test.prj
+++ b/test/UIHandler/EPTF_UIHandler_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/UIHandler/EPTF_UIHandler_Test.tpd b/test/UIHandler/EPTF_UIHandler_Test.tpd
index 1b8c782..2b03c84 100644
--- a/test/UIHandler/EPTF_UIHandler_Test.tpd
+++ b/test/UIHandler/EPTF_UIHandler_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/UIHandler/EPTF_UIHandler_Test2.cfg b/test/UIHandler/EPTF_UIHandler_Test2.cfg
index 8530aa2..9b6e2a0 100644
--- a/test/UIHandler/EPTF_UIHandler_Test2.cfg
+++ b/test/UIHandler/EPTF_UIHandler_Test2.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/test/UIHandler/EPTF_UIHandler_Test2.prj b/test/UIHandler/EPTF_UIHandler_Test2.prj
index 6ed2051..cf29f18 100644
--- a/test/UIHandler/EPTF_UIHandler_Test2.prj
+++ b/test/UIHandler/EPTF_UIHandler_Test2.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/UIHandler/EPTF_UIHandler_Test2.tpd b/test/UIHandler/EPTF_UIHandler_Test2.tpd
index 1d8581b..47f7efe 100644
--- a/test/UIHandler/EPTF_UIHandler_Test2.tpd
+++ b/test/UIHandler/EPTF_UIHandler_Test2.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.cfg b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.cfg
index 291bba9..043a20b 100755
--- a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.cfg
+++ b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.cfg
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
diff --git a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
index dad0902..14b3183 100644
--- a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
+++ b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.tpd b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.tpd
index 7312dcb..8998a4c 100644
--- a/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.tpd
+++ b/test/UIHandler/EPTF_UIHandler_TestEmptyLayout.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/UIHandler/EPTF_UIHandler_TestReconnect.tpd b/test/UIHandler/EPTF_UIHandler_TestReconnect.tpd
index 0013c22..31abc1f 100644
--- a/test/UIHandler/EPTF_UIHandler_TestReconnect.tpd
+++ b/test/UIHandler/EPTF_UIHandler_TestReconnect.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/UIHandler/EPTF_UIHandler_TestReconnect.ttcn b/test/UIHandler/EPTF_UIHandler_TestReconnect.ttcn
index 26f2af9..6c0f523 100644
--- a/test/UIHandler/EPTF_UIHandler_TestReconnect.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_TestReconnect.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //

 ///////////////////////////////////////////////////////////////////////////////

 ///////////////////////////////////////////////////////////

 //  Module: EPTF_UIHandler_Test_Definitions

diff --git a/test/UIHandler/EPTF_UIHandler_Test_ASN1_Definitions.ttcn b/test/UIHandler/EPTF_UIHandler_Test_ASN1_Definitions.ttcn
index 2498d86..fb60ae2 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_ASN1_Definitions.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_Test_ASN1_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 //  Module: EPTF_UIHandler_Test_Definitions
diff --git a/test/UIHandler/EPTF_UIHandler_Test_Definitions.ttcn b/test/UIHandler/EPTF_UIHandler_Test_Definitions.ttcn
index 3636a86..6ccc7c2 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_Definitions.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 //  Module: EPTF_UIHandler_Test_Definitions
diff --git a/test/UIHandler/EPTF_UIHandler_Test_ExternalFunctions.cc b/test/UIHandler/EPTF_UIHandler_Test_ExternalFunctions.cc
index d62dc73..311cc74 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_ExternalFunctions.cc
+++ b/test/UIHandler/EPTF_UIHandler_Test_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 #include <string.h>
diff --git a/test/UIHandler/EPTF_UIHandler_Test_Functions.ttcn b/test/UIHandler/EPTF_UIHandler_Test_Functions.ttcn
index b76d13f..153f182 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_Functions.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/UIHandler/EPTF_UIHandler_Test_IteratorTestcases.ttcn b/test/UIHandler/EPTF_UIHandler_Test_IteratorTestcases.ttcn
index 059c47c..deb7a7c 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_IteratorTestcases.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_Test_IteratorTestcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/UIHandler/EPTF_UIHandler_Test_Testcases.ttcn b/test/UIHandler/EPTF_UIHandler_Test_Testcases.ttcn
index a90258f..bf93f66 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_Testcases.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/UIHandler/EPTF_UIHandler_Test_XSD_Definitions.ttcn b/test/UIHandler/EPTF_UIHandler_Test_XSD_Definitions.ttcn
index d7a7298..7950804 100644
--- a/test/UIHandler/EPTF_UIHandler_Test_XSD_Definitions.ttcn
+++ b/test/UIHandler/EPTF_UIHandler_Test_XSD_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////
 //  Module: EPTF_UIHandler_Test_Definitions
diff --git a/test/UIHandler/EPTF_UIHandler_reconnect.cfg b/test/UIHandler/EPTF_UIHandler_reconnect.cfg
index 2de230f..707486b 100644
--- a/test/UIHandler/EPTF_UIHandler_reconnect.cfg
+++ b/test/UIHandler/EPTF_UIHandler_reconnect.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]

 tsp_xtdp_listen_addr := "localhost"

diff --git a/test/UIHandler/Makefile_script b/test/UIHandler/Makefile_script
index d3a0a60..ec2a8c3 100755
--- a/test/UIHandler/Makefile_script
+++ b/test/UIHandler/Makefile_script
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 sed -e '
 s/CPPFLAGS = .*/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -DNO_IPV6/g
diff --git a/test/UIHandler/runTop.sh b/test/UIHandler/runTop.sh
index d264bb7..875540c 100755
--- a/test/UIHandler/runTop.sh
+++ b/test/UIHandler/runTop.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 #endres=`top bd00.50n2|grep Cpu| tail -n1 | sed 's/.*Cpu(s): //g;s/%us,.*//g'`   // global cpu usage
diff --git a/test/UIHandler/smokeTests.txt b/test/UIHandler/smokeTests.txt
index 71812f4..981ecbe 100644
--- a/test/UIHandler/smokeTests.txt
+++ b/test/UIHandler/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_UIHandler_Test_Testcases.tc_Messages 
 EPTF_UIHandler_Test_Testcases.tc_EPTF_UIHandler_Test_UIHandler_init_withoutGui
diff --git a/test/Variable/EPTF_Variable_PerfTest.cfg b/test/Variable/EPTF_Variable_PerfTest.cfg
index 52bf417..bcdcb45 100644
--- a/test/Variable/EPTF_Variable_PerfTest.cfg
+++ b/test/Variable/EPTF_Variable_PerfTest.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MODULE_PARAMETERS]
 
diff --git a/test/Variable/EPTF_Variable_PerfTest.grp b/test/Variable/EPTF_Variable_PerfTest.grp
index 527e567..3d62fca 100644
--- a/test/Variable/EPTF_Variable_PerfTest.grp
+++ b/test/Variable/EPTF_Variable_PerfTest.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/Variable/EPTF_Variable_PerfTest.prj b/test/Variable/EPTF_Variable_PerfTest.prj
index d19c66d..4ae60b3 100644
--- a/test/Variable/EPTF_Variable_PerfTest.prj
+++ b/test/Variable/EPTF_Variable_PerfTest.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Variable/EPTF_Variable_PerfTest_Definitions.ttcn b/test/Variable/EPTF_Variable_PerfTest_Definitions.ttcn
index 9f2510c..9c5ef04 100644
--- a/test/Variable/EPTF_Variable_PerfTest_Definitions.ttcn
+++ b/test/Variable/EPTF_Variable_PerfTest_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Variable/EPTF_Variable_PerfTest_Functions.ttcn b/test/Variable/EPTF_Variable_PerfTest_Functions.ttcn
index 3a83cd0..7db620c 100644
--- a/test/Variable/EPTF_Variable_PerfTest_Functions.ttcn
+++ b/test/Variable/EPTF_Variable_PerfTest_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Variable/EPTF_Variable_PerfTest_Testcases.ttcn b/test/Variable/EPTF_Variable_PerfTest_Testcases.ttcn
index 1ce3b34..493f4ea 100644
--- a/test/Variable/EPTF_Variable_PerfTest_Testcases.ttcn
+++ b/test/Variable/EPTF_Variable_PerfTest_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Variable/EPTF_Variable_Test.cfg b/test/Variable/EPTF_Variable_Test.cfg
index 8325519..7824057 100644
--- a/test/Variable/EPTF_Variable_Test.cfg
+++ b/test/Variable/EPTF_Variable_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [DEFINE]
 selfname := "Test"
diff --git a/test/Variable/EPTF_Variable_Test.grp b/test/Variable/EPTF_Variable_Test.grp
index 8f6bd1a..e525c85 100644
--- a/test/Variable/EPTF_Variable_Test.grp
+++ b/test/Variable/EPTF_Variable_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 -->
 <!DOCTYPE TITAN_GUI_FileGroup_file>
diff --git a/test/Variable/EPTF_Variable_Test.prj b/test/Variable/EPTF_Variable_Test.prj
index 611762c..b2d9eb0 100644
--- a/test/Variable/EPTF_Variable_Test.prj
+++ b/test/Variable/EPTF_Variable_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/Variable/EPTF_Variable_Test.tpd b/test/Variable/EPTF_Variable_Test.tpd
index c242fde..c204b9b 100644
--- a/test/Variable/EPTF_Variable_Test.tpd
+++ b/test/Variable/EPTF_Variable_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/Variable/EPTF_Variable_Test_Definitions.ttcn b/test/Variable/EPTF_Variable_Test_Definitions.ttcn
index ad9b534..b375b37 100644
--- a/test/Variable/EPTF_Variable_Test_Definitions.ttcn
+++ b/test/Variable/EPTF_Variable_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Variable/EPTF_Variable_Test_Functions.ttcn b/test/Variable/EPTF_Variable_Test_Functions.ttcn
index 6f98c24..6001a74 100644
--- a/test/Variable/EPTF_Variable_Test_Functions.ttcn
+++ b/test/Variable/EPTF_Variable_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Variable/EPTF_Variable_Test_Testcases.ttcn b/test/Variable/EPTF_Variable_Test_Testcases.ttcn
index 6ea49e2..45ac770 100644
--- a/test/Variable/EPTF_Variable_Test_Testcases.ttcn
+++ b/test/Variable/EPTF_Variable_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/Variable/README.txt b/test/Variable/README.txt
index 8fa0fc3..eade64d 100644
--- a/test/Variable/README.txt
+++ b/test/Variable/README.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 In order to use the project file, you have to define some variables

 in the Eclipse workplace.

diff --git a/test/Variable/makefile_patch.sh b/test/Variable/makefile_patch.sh
index 8b9315a..74eaa38 100755
--- a/test/Variable/makefile_patch.sh
+++ b/test/Variable/makefile_patch.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/test/Variable/smokeTests.txt b/test/Variable/smokeTests.txt
index be6d213..23fc6bb 100644
--- a/test/Variable/smokeTests.txt
+++ b/test/Variable/smokeTests.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 EPTF_Variable_Test_Testcases.tc_EPTF_Var_CreateAndModifyTest
 EPTF_Variable_Test_Testcases.tc_EPTF_Var_AdjustTest
diff --git a/test/Variable/storePerformanceResults.sh b/test/Variable/storePerformanceResults.sh
index 2421bc8..eb0284e 100755
--- a/test/Variable/storePerformanceResults.sh
+++ b/test/Variable/storePerformanceResults.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # Add thich to the CFG file:
diff --git a/test/WebGUI/EPTF_WebGUI_Test.cfg b/test/WebGUI/EPTF_WebGUI_Test.cfg
index 388c821..1a087a3 100644
--- a/test/WebGUI/EPTF_WebGUI_Test.cfg
+++ b/test/WebGUI/EPTF_WebGUI_Test.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/test/WebGUI/EPTF_WebGUI_Test.grp b/test/WebGUI/EPTF_WebGUI_Test.grp
index 4bc61cd..a4bb71e 100644
--- a/test/WebGUI/EPTF_WebGUI_Test.grp
+++ b/test/WebGUI/EPTF_WebGUI_Test.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/test/WebGUI/EPTF_WebGUI_Test.prj b/test/WebGUI/EPTF_WebGUI_Test.prj
index 1f55bb7..a79a4bc 100644
--- a/test/WebGUI/EPTF_WebGUI_Test.prj
+++ b/test/WebGUI/EPTF_WebGUI_Test.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/test/WebGUI/EPTF_WebGUI_Test.tpd b/test/WebGUI/EPTF_WebGUI_Test.tpd
index c1712ac..3dead0d 100644
--- a/test/WebGUI/EPTF_WebGUI_Test.tpd
+++ b/test/WebGUI/EPTF_WebGUI_Test.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/test/WebGUI/EPTF_WebGUI_Test_Definitions.ttcn b/test/WebGUI/EPTF_WebGUI_Test_Definitions.ttcn
index 99ea170..6fe68e4 100644
--- a/test/WebGUI/EPTF_WebGUI_Test_Definitions.ttcn
+++ b/test/WebGUI/EPTF_WebGUI_Test_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/WebGUI/EPTF_WebGUI_Test_Functions.ttcn b/test/WebGUI/EPTF_WebGUI_Test_Functions.ttcn
index ec947b9..09a45cc 100644
--- a/test/WebGUI/EPTF_WebGUI_Test_Functions.ttcn
+++ b/test/WebGUI/EPTF_WebGUI_Test_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/WebGUI/EPTF_WebGUI_Test_Testcases.ttcn b/test/WebGUI/EPTF_WebGUI_Test_Testcases.ttcn
index f30a636..a5173a1 100644
--- a/test/WebGUI/EPTF_WebGUI_Test_Testcases.ttcn
+++ b/test/WebGUI/EPTF_WebGUI_Test_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/test/WebGUI/MockTest/AjvSelfTest.js b/test/WebGUI/MockTest/AjvSelfTest.js
index 7992cd8..f589d59 100644
--- a/test/WebGUI/MockTest/AjvSelfTest.js
+++ b/test/WebGUI/MockTest/AjvSelfTest.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function AjvSelfTest() {

     "use strict";

diff --git a/test/WebGUI/MockTest/Main.js b/test/WebGUI/MockTest/Main.js
index fe94ed8..9808532 100644
--- a/test/WebGUI/MockTest/Main.js
+++ b/test/WebGUI/MockTest/Main.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 var WebApplications = WebApplications || [];

 

diff --git a/test/WebGUI/MockTest/TestConfigModelFiller.js b/test/WebGUI/MockTest/TestConfigModelFiller.js
index 1b7d44b..dc27fb4 100644
--- a/test/WebGUI/MockTest/TestConfigModelFiller.js
+++ b/test/WebGUI/MockTest/TestConfigModelFiller.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function TestConfigModelFiller(p_model) {

 

diff --git a/test/WebGUI/MockedServer/DSHelp.js b/test/WebGUI/MockedServer/DSHelp.js
index a2c9bb1..09d92be 100644
--- a/test/WebGUI/MockedServer/DSHelp.js
+++ b/test/WebGUI/MockedServer/DSHelp.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 DSHelp = {

     "sources": [

diff --git a/test/WebGUI/MockedServer/DataGenerator.js b/test/WebGUI/MockedServer/DataGenerator.js
index 8cd4a3d..d418097 100644
--- a/test/WebGUI/MockedServer/DataGenerator.js
+++ b/test/WebGUI/MockedServer/DataGenerator.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function DataGenerator() {

 

diff --git a/test/WebGUI/MockedServer/DsRestAPIComm_Mock.js b/test/WebGUI/MockedServer/DsRestAPIComm_Mock.js
index 050fa54..6511a7e 100644
--- a/test/WebGUI/MockedServer/DsRestAPIComm_Mock.js
+++ b/test/WebGUI/MockedServer/DsRestAPIComm_Mock.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 /**

 The function we mock.

diff --git a/test/WebGUI/MockedServer/FileHandler.js b/test/WebGUI/MockedServer/FileHandler.js
index 4c13d10..d8af615 100644
--- a/test/WebGUI/MockedServer/FileHandler.js
+++ b/test/WebGUI/MockedServer/FileHandler.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function FileHandler() {
 
diff --git a/test/WebGUI/MockedServer/Model.js b/test/WebGUI/MockedServer/Model.js
index 6234864..4ef233b 100644
--- a/test/WebGUI/MockedServer/Model.js
+++ b/test/WebGUI/MockedServer/Model.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function Model(p_dataGenerator) {

 

diff --git a/test/WebGUI/Selenium/BaseTestCase.py b/test/WebGUI/Selenium/BaseTestCase.py
index 2cf73e0..3535e6a 100755
--- a/test/WebGUI/Selenium/BaseTestCase.py
+++ b/test/WebGUI/Selenium/BaseTestCase.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import os
diff --git a/test/WebGUI/Selenium/Framework_CommonFunctions.py b/test/WebGUI/Selenium/Framework_CommonFunctions.py
index 7bad155..8a5c8d0 100644
--- a/test/WebGUI/Selenium/Framework_CommonFunctions.py
+++ b/test/WebGUI/Selenium/Framework_CommonFunctions.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import time
diff --git a/test/WebGUI/Selenium/Framework_LoadingWebApps.py b/test/WebGUI/Selenium/Framework_LoadingWebApps.py
index f3563ba..7c8a1ce 100755
--- a/test/WebGUI/Selenium/Framework_LoadingWebApps.py
+++ b/test/WebGUI/Selenium/Framework_LoadingWebApps.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import time
diff --git a/test/WebGUI/Selenium/GuiEditor_CommonFunctions.py b/test/WebGUI/Selenium/GuiEditor_CommonFunctions.py
index 126e7c5..59ab45f 100644
--- a/test/WebGUI/Selenium/GuiEditor_CommonFunctions.py
+++ b/test/WebGUI/Selenium/GuiEditor_CommonFunctions.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import time
diff --git a/test/WebGUI/Selenium/GuiEditor_ConnectionTests.py b/test/WebGUI/Selenium/GuiEditor_ConnectionTests.py
index 2a1635e..e8ec968 100644
--- a/test/WebGUI/Selenium/GuiEditor_ConnectionTests.py
+++ b/test/WebGUI/Selenium/GuiEditor_ConnectionTests.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 from BaseTestCase import *
diff --git a/test/WebGUI/Selenium/GuiEditor_EditorTests.py b/test/WebGUI/Selenium/GuiEditor_EditorTests.py
index 6043bc3..96d547b 100644
--- a/test/WebGUI/Selenium/GuiEditor_EditorTests.py
+++ b/test/WebGUI/Selenium/GuiEditor_EditorTests.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import re
diff --git a/test/WebGUI/Selenium/GuiEditor_SetupHandlingTests.py b/test/WebGUI/Selenium/GuiEditor_SetupHandlingTests.py
index 9cfe51f..18c1061 100755
--- a/test/WebGUI/Selenium/GuiEditor_SetupHandlingTests.py
+++ b/test/WebGUI/Selenium/GuiEditor_SetupHandlingTests.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 from BaseTestCase import *
diff --git a/test/WebGUI/Selenium/RequestConsole_Tests.py b/test/WebGUI/Selenium/RequestConsole_Tests.py
index d675f3f..f7945c2 100755
--- a/test/WebGUI/Selenium/RequestConsole_Tests.py
+++ b/test/WebGUI/Selenium/RequestConsole_Tests.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 import re
diff --git a/test/WebGUI/Selenium/runTests.py b/test/WebGUI/Selenium/runTests.py
index 04f64c4..caa72e2 100644
--- a/test/WebGUI/Selenium/runTests.py
+++ b/test/WebGUI/Selenium/runTests.py
@@ -4,9 +4,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 from Framework_LoadingWebApps import *
diff --git a/test/WebGUI/Selenium/runTestsWithXvfb.sh b/test/WebGUI/Selenium/runTestsWithXvfb.sh
index 2deaece..1eec11a 100755
--- a/test/WebGUI/Selenium/runTestsWithXvfb.sh
+++ b/test/WebGUI/Selenium/runTestsWithXvfb.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 echo "Checking if Xvfb is running..."
diff --git a/test/WebGUI/createOfflineWebGUI.sh b/test/WebGUI/createOfflineWebGUI.sh
index 0ca963f..79af4d2 100755
--- a/test/WebGUI/createOfflineWebGUI.sh
+++ b/test/WebGUI/createOfflineWebGUI.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 CURRENT_DIR=`pwd`
diff --git a/test/tpd_cfg_connections.txt b/test/tpd_cfg_connections.txt
index 3249fd7..7ac45a0 100644
--- a/test/tpd_cfg_connections.txt
+++ b/test/tpd_cfg_connections.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 #
 # tpd_cfg_connections.txt
diff --git a/tools/CallStackAnalizer/CallStackAnalizer.awk b/tools/CallStackAnalizer/CallStackAnalizer.awk
index 2e4bcda..5b1555e 100644
--- a/tools/CallStackAnalizer/CallStackAnalizer.awk
+++ b/tools/CallStackAnalizer/CallStackAnalizer.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # Analizes the callstacks in the given Titan logfiles
 # and prints the callstack ordered by how many functions or altstep calls it has
diff --git a/tools/CheckCopyConstructor/CheckCopyConstuctor.sh b/tools/CheckCopyConstructor/CheckCopyConstuctor.sh
index cae5c5f..2bf6344 100755
--- a/tools/CheckCopyConstructor/CheckCopyConstuctor.sh
+++ b/tools/CheckCopyConstructor/CheckCopyConstuctor.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/tools/CheckCopyConstructor/CopyConstCheck.awk b/tools/CheckCopyConstructor/CopyConstCheck.awk
index 20de3dd..db5aa61 100644
--- a/tools/CheckCopyConstructor/CopyConstCheck.awk
+++ b/tools/CheckCopyConstructor/CopyConstCheck.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
   copyConstString = "_shadow";
diff --git a/tools/CheckCopyConstructor/readme.txt b/tools/CheckCopyConstructor/readme.txt
index ad17d38..6b38512 100644
--- a/tools/CheckCopyConstructor/readme.txt
+++ b/tools/CheckCopyConstructor/readme.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 This script will print out any copy constructor calls generated by TITAN.
diff --git a/tools/DependencyGraphCreation/README.txt b/tools/DependencyGraphCreation/README.txt
index 6c1a1de..ab0fa0c 100755
--- a/tools/DependencyGraphCreation/README.txt
+++ b/tools/DependencyGraphCreation/README.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 The scripts

   * make-import-graphs.sh

diff --git a/tools/DependencyGraphCreation/extend_graph.sh b/tools/DependencyGraphCreation/extend_graph.sh
index bb2f769..3063682 100755
--- a/tools/DependencyGraphCreation/extend_graph.sh
+++ b/tools/DependencyGraphCreation/extend_graph.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 #//
 #//  File:     extend_graph.sh
diff --git a/tools/DependencyGraphCreation/feature_graph.sh b/tools/DependencyGraphCreation/feature_graph.sh
index 0009851..558340f 100755
--- a/tools/DependencyGraphCreation/feature_graph.sh
+++ b/tools/DependencyGraphCreation/feature_graph.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 #//
 #//  File:     feature_graph.sh
diff --git a/tools/DependencyGraphCreation/make-extend-graph.sh b/tools/DependencyGraphCreation/make-extend-graph.sh
index e74a4b8..024374f 100755
--- a/tools/DependencyGraphCreation/make-extend-graph.sh
+++ b/tools/DependencyGraphCreation/make-extend-graph.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 if [ -z $1 ] 
diff --git a/tools/DependencyGraphCreation/make-graph-images.sh b/tools/DependencyGraphCreation/make-graph-images.sh
index a7ddff3..798ddbe 100755
--- a/tools/DependencyGraphCreation/make-graph-images.sh
+++ b/tools/DependencyGraphCreation/make-graph-images.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 for file in *.dot; do echo $file; dot -Tpng -o `basename $file .dot`.png $file; done
diff --git a/tools/DependencyGraphCreation/make-graphs.sh b/tools/DependencyGraphCreation/make-graphs.sh
index b8da863..4b5d42e 100755
--- a/tools/DependencyGraphCreation/make-graphs.sh
+++ b/tools/DependencyGraphCreation/make-graphs.sh
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 rm   deps.extend.dot deps.import.dot  deps.extend.png deps.import.png
 ./make-extend-graph.sh $* > deps.extend.dot; 
diff --git a/tools/DependencyGraphCreation/make-import-graphs.sh b/tools/DependencyGraphCreation/make-import-graphs.sh
index c658b3e..8ec547d 100755
--- a/tools/DependencyGraphCreation/make-import-graphs.sh
+++ b/tools/DependencyGraphCreation/make-import-graphs.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 if [ -z $1 ] 
diff --git a/tools/HelpForDataSources/EPTF_DSHelp.cfg b/tools/HelpForDataSources/EPTF_DSHelp.cfg
index d765e5b..1f5a4b5 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp.cfg
+++ b/tools/HelpForDataSources/EPTF_DSHelp.cfg
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 [MAIN_CONTROLLER]
 
diff --git a/tools/HelpForDataSources/EPTF_DSHelp.grp b/tools/HelpForDataSources/EPTF_DSHelp.grp
index a6bdb10..8106352 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp.grp
+++ b/tools/HelpForDataSources/EPTF_DSHelp.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 -->
diff --git a/tools/HelpForDataSources/EPTF_DSHelp.prj b/tools/HelpForDataSources/EPTF_DSHelp.prj
index c6ac997..a7f6657 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp.prj
+++ b/tools/HelpForDataSources/EPTF_DSHelp.prj
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <!DOCTYPE TITAN_GUI_project_file>
diff --git a/tools/HelpForDataSources/EPTF_DSHelp.tpd b/tools/HelpForDataSources/EPTF_DSHelp.tpd
index 6bcc124..36ea0bb 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp.tpd
+++ b/tools/HelpForDataSources/EPTF_DSHelp.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/tools/HelpForDataSources/EPTF_DSHelp_Definitions.ttcn b/tools/HelpForDataSources/EPTF_DSHelp_Definitions.ttcn
index d19f697..1140bd2 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp_Definitions.ttcn
+++ b/tools/HelpForDataSources/EPTF_DSHelp_Definitions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/HelpForDataSources/EPTF_DSHelp_Functions.ttcn b/tools/HelpForDataSources/EPTF_DSHelp_Functions.ttcn
index e230406..904fc5b 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp_Functions.ttcn
+++ b/tools/HelpForDataSources/EPTF_DSHelp_Functions.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/HelpForDataSources/EPTF_DSHelp_Testcases.ttcn b/tools/HelpForDataSources/EPTF_DSHelp_Testcases.ttcn
index fb88ff7..4940c4e 100644
--- a/tools/HelpForDataSources/EPTF_DSHelp_Testcases.ttcn
+++ b/tools/HelpForDataSources/EPTF_DSHelp_Testcases.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/HelpForDataSources/GUI/Application/Main.css b/tools/HelpForDataSources/GUI/Application/Main.css
index ea9cc74..95ecb74 100644
--- a/tools/HelpForDataSources/GUI/Application/Main.css
+++ b/tools/HelpForDataSources/GUI/Application/Main.css
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 */
 
diff --git a/tools/HelpForDataSources/GUI/Application/Main.html b/tools/HelpForDataSources/GUI/Application/Main.html
index 4fece51..1cdf810 100644
--- a/tools/HelpForDataSources/GUI/Application/Main.html
+++ b/tools/HelpForDataSources/GUI/Application/Main.html
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html>
diff --git a/tools/HelpForDataSources/GUI/Application/View.js b/tools/HelpForDataSources/GUI/Application/View.js
index 1aef0a0..1c279a1 100644
--- a/tools/HelpForDataSources/GUI/Application/View.js
+++ b/tools/HelpForDataSources/GUI/Application/View.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function CView(aViewModel)

 {

diff --git a/tools/HelpForDataSources/GUI/Application/ViewModel.js b/tools/HelpForDataSources/GUI/Application/ViewModel.js
index 9c0f6a7..e9afb0d 100644
--- a/tools/HelpForDataSources/GUI/Application/ViewModel.js
+++ b/tools/HelpForDataSources/GUI/Application/ViewModel.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 /** App specific runtime behaviour */
 
diff --git a/tools/NaturaldocsGeneration/Languages.txt b/tools/NaturaldocsGeneration/Languages.txt
index b86b686..070d0d7 100644
--- a/tools/NaturaldocsGeneration/Languages.txt
+++ b/tools/NaturaldocsGeneration/Languages.txt
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 Format: 1.35
 
diff --git a/tools/NaturaldocsGeneration/Menu.txt b/tools/NaturaldocsGeneration/Menu.txt
index 1cf7c73..7f7f2c3 100644
--- a/tools/NaturaldocsGeneration/Menu.txt
+++ b/tools/NaturaldocsGeneration/Menu.txt
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 Format: 1.35
 
diff --git a/tools/NaturaldocsGeneration/TITANSim.html b/tools/NaturaldocsGeneration/TITANSim.html
index fce5cec..a82a10b 100644
--- a/tools/NaturaldocsGeneration/TITANSim.html
+++ b/tools/NaturaldocsGeneration/TITANSim.html
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html>

diff --git a/tools/NaturaldocsGeneration/Topics.txt b/tools/NaturaldocsGeneration/Topics.txt
index 907dd32..eab9291 100644
--- a/tools/NaturaldocsGeneration/Topics.txt
+++ b/tools/NaturaldocsGeneration/Topics.txt
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 Format: 1.35
 
diff --git a/tools/NaturaldocsGeneration/closegroups.sh b/tools/NaturaldocsGeneration/closegroups.sh
index 154c682..9148630 100644
--- a/tools/NaturaldocsGeneration/closegroups.sh
+++ b/tools/NaturaldocsGeneration/closegroups.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 sed -e 's/<div class=MGroupContent id=\([a-zA-Z0-9]*\)>/<div class=MGroupContent id=\1 style=\"display: none;\">/g' <$1 >$2
\ No newline at end of file
diff --git a/tools/NaturaldocsGeneration/generate.sh b/tools/NaturaldocsGeneration/generate.sh
index f0a1e77..f66801d 100755
--- a/tools/NaturaldocsGeneration/generate.sh
+++ b/tools/NaturaldocsGeneration/generate.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # USAGE:
diff --git a/tools/NaturaldocsGeneration/generateAPIDoc.sh b/tools/NaturaldocsGeneration/generateAPIDoc.sh
index 5f44c23..0f3bc5d 100755
--- a/tools/NaturaldocsGeneration/generateAPIDoc.sh
+++ b/tools/NaturaldocsGeneration/generateAPIDoc.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 # USAGE:
diff --git a/tools/NaturaldocsGeneration/index.html b/tools/NaturaldocsGeneration/index.html
index 7b4baed..9ab88d9 100644
--- a/tools/NaturaldocsGeneration/index.html
+++ b/tools/NaturaldocsGeneration/index.html
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html><head><title></title></head>

diff --git a/tools/NaturaldocsGeneration/load.css b/tools/NaturaldocsGeneration/load.css
index 43d336d..82200fc 100644
--- a/tools/NaturaldocsGeneration/load.css
+++ b/tools/NaturaldocsGeneration/load.css
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 */
 .CRequirementTestcase .Prototype { background-color: #F4F4F4; border-color: #D0D0D0 }
diff --git a/tools/NaturaldocsGeneration/repairunnaturalhtml.pl b/tools/NaturaldocsGeneration/repairunnaturalhtml.pl
index ce88a7c..8b4f921 100644
--- a/tools/NaturaldocsGeneration/repairunnaturalhtml.pl
+++ b/tools/NaturaldocsGeneration/repairunnaturalhtml.pl
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 use strict;
diff --git a/tools/NaturaldocsGeneration/update2.sh b/tools/NaturaldocsGeneration/update2.sh
index cae6f8b..6f62760 100755
--- a/tools/NaturaldocsGeneration/update2.sh
+++ b/tools/NaturaldocsGeneration/update2.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Definitions.ttcnin b/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Definitions.ttcnin
index 5d39544..9f44c97 100644
--- a/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Definitions.ttcnin
+++ b/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Definitions.ttcnin
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Functions.ttcnin b/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Functions.ttcnin
index 4fce3d0..1a6923b 100644
--- a/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Functions.ttcnin
+++ b/tools/PoolMgmt/EPTF_CLL_PoolMgmt_Functions.ttcnin
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/PoolMgmt/EPTF_PoolManagement.grp b/tools/PoolMgmt/EPTF_PoolManagement.grp
index 95ec817..f6907c8 100644
--- a/tools/PoolMgmt/EPTF_PoolManagement.grp
+++ b/tools/PoolMgmt/EPTF_PoolManagement.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/PoolMgmt/createPool.sh b/tools/PoolMgmt/createPool.sh
index 23bc09b..861094b 100755
--- a/tools/PoolMgmt/createPool.sh
+++ b/tools/PoolMgmt/createPool.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 if ([$1 == ""]) then
diff --git a/tools/PoolMgmt/generatedCode_dummy.ttcn b/tools/PoolMgmt/generatedCode_dummy.ttcn
index b1c5df1..276e73e 100644
--- a/tools/PoolMgmt/generatedCode_dummy.ttcn
+++ b/tools/PoolMgmt/generatedCode_dummy.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////
diff --git a/tools/SysStatLogger/sysstatLogger.sh b/tools/SysStatLogger/sysstatLogger.sh
index 73fa21c..946e50f 100755
--- a/tools/SysStatLogger/sysstatLogger.sh
+++ b/tools/SysStatLogger/sysstatLogger.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 ###############################################################################
diff --git a/tools/TTCN3Coverage/CodeLineCount.awk b/tools/TTCN3Coverage/CodeLineCount.awk
index abf9017..a69469f 100644
--- a/tools/TTCN3Coverage/CodeLineCount.awk
+++ b/tools/TTCN3Coverage/CodeLineCount.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
 FS=",[ \t]*|[ \t]+|[()]+"
diff --git a/tools/TTCN3Coverage/EPTF_CLL_TTCN3Coverage.ttcn b/tools/TTCN3Coverage/EPTF_CLL_TTCN3Coverage.ttcn
index b958c19..0d6dc0e 100644
--- a/tools/TTCN3Coverage/EPTF_CLL_TTCN3Coverage.ttcn
+++ b/tools/TTCN3Coverage/EPTF_CLL_TTCN3Coverage.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/TTCN3Coverage/ExtractFunctions.awk b/tools/TTCN3Coverage/ExtractFunctions.awk
index 000fefe..37532f8 100644
--- a/tools/TTCN3Coverage/ExtractFunctions.awk
+++ b/tools/TTCN3Coverage/ExtractFunctions.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
 FS="\"|,[ \t]*|[ \t]+|[()]+|:[ \t]*"
diff --git a/tools/TTCN3Coverage/GetSourceFileName.awk b/tools/TTCN3Coverage/GetSourceFileName.awk
index dd2439c..982217a 100644
--- a/tools/TTCN3Coverage/GetSourceFileName.awk
+++ b/tools/TTCN3Coverage/GetSourceFileName.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 BEGIN {
diff --git a/tools/TTCN3Coverage/GetUnusedFns.awk b/tools/TTCN3Coverage/GetUnusedFns.awk
index 38df9f2..4371efd 100644
--- a/tools/TTCN3Coverage/GetUnusedFns.awk
+++ b/tools/TTCN3Coverage/GetUnusedFns.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
   FS=":[ \t]*|[ \t]+"
diff --git a/tools/TTCN3Coverage/MergeResults.awk b/tools/TTCN3Coverage/MergeResults.awk
index ba12f9e..f3452cd 100644
--- a/tools/TTCN3Coverage/MergeResults.awk
+++ b/tools/TTCN3Coverage/MergeResults.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # This processes the output produced by the executable test suite.
 # It merges them into a single aggregated output.
diff --git a/tools/TTCN3Coverage/ShowCoverage.pats b/tools/TTCN3Coverage/ShowCoverage.pats
index 967aaf9..5506522 100644
--- a/tools/TTCN3Coverage/ShowCoverage.pats
+++ b/tools/TTCN3Coverage/ShowCoverage.pats
@@ -2,9 +2,9 @@
 !// Copyright (c) 2000-2017 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                                 //
 !///////////////////////////////////////////////////////////////////////////////
 ! Preferences file for NEdit
 !
diff --git a/tools/TTCN3Coverage/TTCN3Coverage.awk b/tools/TTCN3Coverage/TTCN3Coverage.awk
index 493a7e5..d11aa93 100644
--- a/tools/TTCN3Coverage/TTCN3Coverage.awk
+++ b/tools/TTCN3Coverage/TTCN3Coverage.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
 FS=",[ \t]*|[ \t]+|[()]+"
diff --git a/tools/TTCN3Coverage/TTCN3Coverage.grp b/tools/TTCN3Coverage/TTCN3Coverage.grp
index 98f853d..ef67c01 100644
--- a/tools/TTCN3Coverage/TTCN3Coverage.grp
+++ b/tools/TTCN3Coverage/TTCN3Coverage.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TTCN3Coverage/TTCN3Coverage.tpd b/tools/TTCN3Coverage/TTCN3Coverage.tpd
index d2ee308..df89d21 100644
--- a/tools/TTCN3Coverage/TTCN3Coverage.tpd
+++ b/tools/TTCN3Coverage/TTCN3Coverage.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/tools/TTCN3Coverage/compiler b/tools/TTCN3Coverage/compiler
index 60d22a5..7e58113 100755
--- a/tools/TTCN3Coverage/compiler
+++ b/tools/TTCN3Coverage/compiler
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 echo "ttcn3cov_compiler version 1.0"
 
diff --git a/tools/TTCN3Coverage/cov2ttcn3 b/tools/TTCN3Coverage/cov2ttcn3
index 021120d..5b4eca5 100755
--- a/tools/TTCN3Coverage/cov2ttcn3
+++ b/tools/TTCN3Coverage/cov2ttcn3
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 echo "cov2ttcn3 version 1.0"
 
diff --git a/tools/TTCN3Coverage/coverage2nedit.awk b/tools/TTCN3Coverage/coverage2nedit.awk
index c210a7f..1e8a9c8 100644
--- a/tools/TTCN3Coverage/coverage2nedit.awk
+++ b/tools/TTCN3Coverage/coverage2nedit.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # this file is used by the nedit macro: ShowCoverage.pats
 # needed to generate the file with coverage info at the beginning of the lines
diff --git a/tools/TTCN3Coverage/make b/tools/TTCN3Coverage/make
index fcd1662..9bf261b 100755
--- a/tools/TTCN3Coverage/make
+++ b/tools/TTCN3Coverage/make
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 echo "make_ttcn3cov version 1.0"
 echo "Makefile patcher and make utility for TTCN3Coverage"
diff --git a/tools/TTCN3Coverage/ttcn3cov b/tools/TTCN3Coverage/ttcn3cov
index 279f57b..21e544d 100755
--- a/tools/TTCN3Coverage/ttcn3cov
+++ b/tools/TTCN3Coverage/ttcn3cov
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # if no arguments and not piped print info:
 if [ ! "$*" -a -t 0 ]
diff --git a/tools/TTCN3Coverage/ttcn3cov.cc b/tools/TTCN3Coverage/ttcn3cov.cc
index b3e1ff1..4ff8825 100644
--- a/tools/TTCN3Coverage/ttcn3cov.cc
+++ b/tools/TTCN3Coverage/ttcn3cov.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TTCN3Coverage/ttcn3cov.hh b/tools/TTCN3Coverage/ttcn3cov.hh
index 93eb3bb..3979447 100644
--- a/tools/TTCN3Coverage/ttcn3cov.hh
+++ b/tools/TTCN3Coverage/ttcn3cov.hh
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TTCN3Coverage/ttcn3cov_gen b/tools/TTCN3Coverage/ttcn3cov_gen
index 24034f4..58d029b 100755
--- a/tools/TTCN3Coverage/ttcn3cov_gen
+++ b/tools/TTCN3Coverage/ttcn3cov_gen
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 #Generates coverage info to TTCN3Coverage.log
 #and prints out only the overall information.
diff --git a/tools/TTCN3Coverage/ttcn3cov_unusedFns b/tools/TTCN3Coverage/ttcn3cov_unusedFns
index 664ee3e..204b209 100755
--- a/tools/TTCN3Coverage/ttcn3cov_unusedFns
+++ b/tools/TTCN3Coverage/ttcn3cov_unusedFns
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 #prints out the list of unused functions
 TTCN3COV_FNS=""
diff --git a/tools/TTCN3Profiler/EPTF_CLL_TTCN3Profiler.ttcn b/tools/TTCN3Profiler/EPTF_CLL_TTCN3Profiler.ttcn
index 83ad8b4..9812794 100644
--- a/tools/TTCN3Profiler/EPTF_CLL_TTCN3Profiler.ttcn
+++ b/tools/TTCN3Profiler/EPTF_CLL_TTCN3Profiler.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/TTCN3Profiler/ShowProfiler.pats b/tools/TTCN3Profiler/ShowProfiler.pats
index b6084fd..4218cf6 100644
--- a/tools/TTCN3Profiler/ShowProfiler.pats
+++ b/tools/TTCN3Profiler/ShowProfiler.pats
@@ -2,9 +2,9 @@
 !// Copyright (c) 2000-2017 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                                 //
 !///////////////////////////////////////////////////////////////////////////////
 ! Preferences file for NEdit
 !
diff --git a/tools/TTCN3Profiler/TTCN3Profiler.awk b/tools/TTCN3Profiler/TTCN3Profiler.awk
index 84c4b06..912a064 100644
--- a/tools/TTCN3Profiler/TTCN3Profiler.awk
+++ b/tools/TTCN3Profiler/TTCN3Profiler.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
 FS=",[ \t]*|[ \t]+|[()]+"
diff --git a/tools/TTCN3Profiler/TTCN3Profiler.grp b/tools/TTCN3Profiler/TTCN3Profiler.grp
index e8ae20e..4b20711 100644
--- a/tools/TTCN3Profiler/TTCN3Profiler.grp
+++ b/tools/TTCN3Profiler/TTCN3Profiler.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TTCN3Profiler/TTCN3Profiler.tpd b/tools/TTCN3Profiler/TTCN3Profiler.tpd
index a3a4f4f..8c17def 100644
--- a/tools/TTCN3Profiler/TTCN3Profiler.tpd
+++ b/tools/TTCN3Profiler/TTCN3Profiler.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/tools/TTCN3Profiler/prof2ttcn3 b/tools/TTCN3Profiler/prof2ttcn3
index c0aa438..2fccc34 100755
--- a/tools/TTCN3Profiler/prof2ttcn3
+++ b/tools/TTCN3Profiler/prof2ttcn3
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 echo "prof2ttcn3 version 1.0"
 
diff --git a/tools/TTCN3Profiler/profiler2nedit.awk b/tools/TTCN3Profiler/profiler2nedit.awk
index f3bb199..0bff199 100644
--- a/tools/TTCN3Profiler/profiler2nedit.awk
+++ b/tools/TTCN3Profiler/profiler2nedit.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # this file is used by the nedit macro: ShowProfiler.pats
 # needed to generate the file with profiler info at the beginning of the lines (in microSeconds)
diff --git a/tools/TTCN3Profiler/ttcn3prof b/tools/TTCN3Profiler/ttcn3prof
index bb646c1..6d781a8 100755
--- a/tools/TTCN3Profiler/ttcn3prof
+++ b/tools/TTCN3Profiler/ttcn3prof
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # if no arguments and not piped print info:
 if [ ! "$*" -a -t 0 ]
diff --git a/tools/TTCN3Profiler/ttcn3prof.cc b/tools/TTCN3Profiler/ttcn3prof.cc
index 421bf28..873bf2d 100644
--- a/tools/TTCN3Profiler/ttcn3prof.cc
+++ b/tools/TTCN3Profiler/ttcn3prof.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TTCN3Profiler/ttcn3prof.hh b/tools/TTCN3Profiler/ttcn3prof.hh
index d89ccab..58da4ae 100644
--- a/tools/TTCN3Profiler/ttcn3prof.hh
+++ b/tools/TTCN3Profiler/ttcn3prof.hh
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TTCN3Profiler/ttcn3prof_GetUnusedFns.awk b/tools/TTCN3Profiler/ttcn3prof_GetUnusedFns.awk
index 270ece0..ccd5419 100644
--- a/tools/TTCN3Profiler/ttcn3prof_GetUnusedFns.awk
+++ b/tools/TTCN3Profiler/ttcn3prof_GetUnusedFns.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN {
   FS=":[ \t]*|[ \t]+"
diff --git a/tools/TTCN3Profiler/ttcn3prof_MergeResults.awk b/tools/TTCN3Profiler/ttcn3prof_MergeResults.awk
index ad849a1..6bbb8e4 100644
--- a/tools/TTCN3Profiler/ttcn3prof_MergeResults.awk
+++ b/tools/TTCN3Profiler/ttcn3prof_MergeResults.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # This processes the output produced by the executable test suite.
 # It merges them into a single aggregated output.
diff --git a/tools/TTCN3Profiler/ttcn3prof_gen b/tools/TTCN3Profiler/ttcn3prof_gen
index 3e8d22d..6e90d2f 100755
--- a/tools/TTCN3Profiler/ttcn3prof_gen
+++ b/tools/TTCN3Profiler/ttcn3prof_gen
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 #Generates profiler info to TTCN3Profiler.log
 #and prints out only the overall information.
diff --git a/tools/TTCN3Profiler/ttcn3prof_unusedFns b/tools/TTCN3Profiler/ttcn3prof_unusedFns
index 488f94b..9f5120b 100755
--- a/tools/TTCN3Profiler/ttcn3prof_unusedFns
+++ b/tools/TTCN3Profiler/ttcn3prof_unusedFns
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 #prints out the list of unused functions
 TTCN3PROF_FNS=""
diff --git a/tools/TestResultGen/GeneratedFiles.grp b/tools/TestResultGen/GeneratedFiles.grp
index 7681fdb..84db1fc 100644
--- a/tools/TestResultGen/GeneratedFiles.grp
+++ b/tools/TestResultGen/GeneratedFiles.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TestResultGen/TestResultGen.grp b/tools/TestResultGen/TestResultGen.grp
index bf0eaa6..d309af3 100644
--- a/tools/TestResultGen/TestResultGen.grp
+++ b/tools/TestResultGen/TestResultGen.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TestResultGen/TestResultGen.tpd b/tools/TestResultGen/TestResultGen.tpd
index 9999c06..825eaae 100644
--- a/tools/TestResultGen/TestResultGen.tpd
+++ b/tools/TestResultGen/TestResultGen.tpd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <TITAN_Project_File_Information version="1.0">
diff --git a/tools/TestResultGen/TestResultGen.ttcn b/tools/TestResultGen/TestResultGen.ttcn
index a91ca02..c6986fb 100644
--- a/tools/TestResultGen/TestResultGen.ttcn
+++ b/tools/TestResultGen/TestResultGen.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/TestResultGen/TestResultGen_Dep.grp b/tools/TestResultGen/TestResultGen_Dep.grp
index c4c0fc8..8eb3c35 100644
--- a/tools/TestResultGen/TestResultGen_Dep.grp
+++ b/tools/TestResultGen/TestResultGen_Dep.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TestResultGen/TestResultGen_ExternalFunctions.cc b/tools/TestResultGen/TestResultGen_ExternalFunctions.cc
index a38a0b1..267ae48 100644
--- a/tools/TestResultGen/TestResultGen_ExternalFunctions.cc
+++ b/tools/TestResultGen/TestResultGen_ExternalFunctions.cc
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TestResultGen/UsefulTtcn3Types.ttcn b/tools/TestResultGen/UsefulTtcn3Types.ttcn
index d4b968b..58fd6ad 100644
--- a/tools/TestResultGen/UsefulTtcn3Types.ttcn
+++ b/tools/TestResultGen/UsefulTtcn3Types.ttcn
@@ -3,9 +3,9 @@
 //  Copyright (c) 2000-2017 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                                 //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/TestResultGen/XSD.ttcn b/tools/TestResultGen/XSD.ttcn
index e2903dd..1e74e0c 100644
--- a/tools/TestResultGen/XSD.ttcn
+++ b/tools/TestResultGen/XSD.ttcn
@@ -3,9 +3,9 @@
 //  Copyright (c) 2000-2017 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                                 //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/TestResultGen/demo/TestResultGen_Demo.grp b/tools/TestResultGen/demo/TestResultGen_Demo.grp
index 76680ba..a87c8cf 100644
--- a/tools/TestResultGen/demo/TestResultGen_Demo.grp
+++ b/tools/TestResultGen/demo/TestResultGen_Demo.grp
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TestResultGen/demo/TestResultGen_Demo.prj b/tools/TestResultGen/demo/TestResultGen_Demo.prj
index 30dbbf2..b5469a9 100644
--- a/tools/TestResultGen/demo/TestResultGen_Demo.prj
+++ b/tools/TestResultGen/demo/TestResultGen_Demo.prj
@@ -4,9 +4,9 @@
 // Copyright (c) 2000-2017 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                                 //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/tools/TestResultGen/demo/TestResultGen_Demo.ttcn b/tools/TestResultGen/demo/TestResultGen_Demo.ttcn
index 38c0f83..e69bba4 100644
--- a/tools/TestResultGen/demo/TestResultGen_Demo.ttcn
+++ b/tools/TestResultGen/demo/TestResultGen_Demo.ttcn
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////
diff --git a/tools/TestResultGen/demo/testresults_example.xml b/tools/TestResultGen/demo/testresults_example.xml
index 5b44c57..2b465a7 100644
--- a/tools/TestResultGen/demo/testresults_example.xml
+++ b/tools/TestResultGen/demo/testresults_example.xml
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->

 
diff --git a/tools/TestResultGen/run_xsd2ttcn.sh b/tools/TestResultGen/run_xsd2ttcn.sh
index 8e6d236..b3ecd10 100755
--- a/tools/TestResultGen/run_xsd2ttcn.sh
+++ b/tools/TestResultGen/run_xsd2ttcn.sh
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 xsd="$(dirname $(readlink -n -f $0))/*.xsd"
diff --git a/tools/TestResultGen/showtest_result.html b/tools/TestResultGen/showtest_result.html
index 067c13a..6de0fb3 100644
--- a/tools/TestResultGen/showtest_result.html
+++ b/tools/TestResultGen/showtest_result.html
@@ -1,7 +1,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <html>

diff --git a/tools/TestResultGen/showtest_result.js b/tools/TestResultGen/showtest_result.js
index 4bd7c03..a8cf5e1 100644
--- a/tools/TestResultGen/showtest_result.js
+++ b/tools/TestResultGen/showtest_result.js
@@ -2,9 +2,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 function transformxml()

 {

diff --git a/tools/TestResultGen/testresults.css b/tools/TestResultGen/testresults.css
index 1eb5dbc..6e98ba1 100644
--- a/tools/TestResultGen/testresults.css
+++ b/tools/TestResultGen/testresults.css
@@ -3,9 +3,9 @@
 // Copyright (c) 2000-2017 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                                 //
 ///////////////////////////////////////////////////////////////////////////////
 */
 ul li pre {
diff --git a/tools/TestResultGen/testresults.xsd b/tools/TestResultGen/testresults.xsd
index 38719f2..74be96a 100644
--- a/tools/TestResultGen/testresults.xsd
+++ b/tools/TestResultGen/testresults.xsd
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/tools/TestResultGen/testresults.xsl b/tools/TestResultGen/testresults.xsl
index 60c2efc..42a760e 100644
--- a/tools/TestResultGen/testresults.xsl
+++ b/tools/TestResultGen/testresults.xsl
@@ -2,7 +2,7 @@
 <!--Copyright (c) 2000-2017 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                           -->
 <xsl:stylesheet version="1.0"

diff --git a/tools/TestResultGen/testresultsXML2HTML.awk b/tools/TestResultGen/testresultsXML2HTML.awk
index 91b1821..fab1a42 100644
--- a/tools/TestResultGen/testresultsXML2HTML.awk
+++ b/tools/TestResultGen/testresultsXML2HTML.awk
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 BEGIN{
   FS="[<>]"
diff --git a/tools/TestResultGen/testresultsXML2HTML.sh b/tools/TestResultGen/testresultsXML2HTML.sh
index 3985524..6e64ad2 100755
--- a/tools/TestResultGen/testresultsXML2HTML.sh
+++ b/tools/TestResultGen/testresultsXML2HTML.sh
@@ -2,9 +2,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 # generates html code from a testresult xml. The testresults.css can be used to format the result
 cat $1 | awk -f testresultsXML2HTML.awk
diff --git a/tools/TestResultGen/ttcn_ericsson_se_TitanSim_Perftest.ttcn b/tools/TestResultGen/ttcn_ericsson_se_TitanSim_Perftest.ttcn
index 75fbc51..83291af 100644
--- a/tools/TestResultGen/ttcn_ericsson_se_TitanSim_Perftest.ttcn
+++ b/tools/TestResultGen/ttcn_ericsson_se_TitanSim_Perftest.ttcn
@@ -3,9 +3,9 @@
 //  Copyright (c) 2000-2017 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                                 //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/Tpd2prj/tpd2prj.py b/tools/Tpd2prj/tpd2prj.py
index ce04558..314f139 100644
--- a/tools/Tpd2prj/tpd2prj.py
+++ b/tools/Tpd2prj/tpd2prj.py
@@ -3,9 +3,9 @@
 #// Copyright (c) 2000-2017 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                                 //
 #///////////////////////////////////////////////////////////////////////////////
 
 #import sys