From 2ca954b0dd4a764ae883ee33c07b542637aec354 Mon Sep 17 00:00:00 2001
From: balaskoa <jeno.balasko@ericsson.com>
Date: Tue, 3 Jul 2018 17:55:42 +0200
Subject: [PATCH] License upgrade to EPL 2.0

Signed-off-by: balaskoa <jeno.balasko@ericsson.com>
---
 demo/Base/EPTF_Base_all.cfg                               | 4 ++--
 demo/Base/EPTF_Base_all.prj                               | 2 +-
 demo/Base/EPTF_Base_all.ttcn                              | 4 ++--
 demo/Base/EPTF_Base_test.cfg                              | 4 ++--
 demo/Base/EPTF_Base_test.prj                              | 2 +-
 demo/Base/EPTF_Base_test.ttcn                             | 4 ++--
 demo/CentralScheduling/Common/Common_Definitions.ttcn     | 4 ++--
 demo/CentralScheduling/EPTF_CS_demo.cfg                   | 4 ++--
 demo/CentralScheduling/EPTF_CS_demo.prj                   | 2 +-
 .../LoadRegulator/LoadRegulator_Definitions.ttcn          | 4 ++--
 .../LoadRegulator/LoadRegulator_Functions.ttcn            | 4 ++--
 demo/CentralScheduling/Main/MainModule.ttcn               | 4 ++--
 demo/CentralScheduling/protocolA/A_defs.ttcn              | 4 ++--
 demo/CentralScheduling/protocolA/CS_A_Definitions.ttcn    | 4 ++--
 demo/CentralScheduling/protocolA/CS_A_Functions.ttcn      | 4 ++--
 demo/CentralScheduling/protocolA/LGen_A_Functions.ttcn    | 4 ++--
 demo/CentralScheduling/protocolB/B_defs.ttcn              | 4 ++--
 demo/CentralScheduling/protocolB/CS_B_Definitions.ttcn    | 4 ++--
 demo/CentralScheduling/protocolB/CS_B_Functions.ttcn      | 4 ++--
 demo/CentralScheduling/protocolB/LGen_B_Functions.ttcn    | 4 ++--
 demo/CommandLineInterface/EPTF_CLL_CLI_Demo.prj           | 2 +-
 demo/CommandLineInterface/EPTF_CLL_CLI_Demo.ttcn          | 4 ++--
 demo/CommandLineInterface/Makefile_patch.sh               | 4 ++--
 demo/CommandLineInterface/cli.cfg                         | 4 ++--
 demo/Common/RndValues_Demo.cfg                            | 4 ++--
 demo/Common/RndValues_Demo.prj                            | 2 +-
 demo/Common/RndValues_Demo.ttcn                           | 4 ++--
 demo/DataSource/DataSource_Demo.grp                       | 4 ++--
 demo/DataSource/EPTF_CLL_DataSource_Demo.ttcn             | 4 ++--
 demo/DataSource/EPTF_DataSource_Demo.cfg                  | 4 ++--
 demo/DataSource/EPTF_DataSource_Demo.prj                  | 2 +-
 demo/DsRestAPI/PythonAPI/exitDsRestAPI.py                 | 4 ++--
 demo/ExecCtrl/AppLib_A_Definitions.ttcn                   | 4 ++--
 demo/ExecCtrl/AppLib_A_Functions.ttcn                     | 4 ++--
 demo/ExecCtrl/ExecControlUIHandler_Demo.grp               | 4 ++--
 demo/ExecCtrl/ExecCtrlLGenPool_Demo.cfg                   | 4 ++--
 demo/ExecCtrl/ExecCtrlLGenPool_Demo.prj                   | 2 +-
 demo/ExecCtrl/ExecCtrlLGenPool_Demo.ttcn                  | 4 ++--
 demo/ExecCtrl/ExecCtrlUIHandler_Demo.ttcn                 | 4 ++--
 demo/ExecCtrl/ExecCtrlUIHandler_demo.prj                  | 4 ++--
 demo/ExecCtrl/ExecCtrl_Demo.ttcn                          | 4 ++--
 demo/ExecCtrl/ExecCtrl_demo.prj                           | 4 ++--
 demo/ExecCtrl/LoadRegUIHandler.grp                        | 4 ++--
 demo/ExecCtrl/execctrld.cfg                               | 4 ++--
 demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.cfg            | 4 ++--
 demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.prj            | 2 +-
 demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.tpd            | 2 +-
 demo/FreeBusyQueue/EPTF_FreeBusyQueue_demo.ttcn           | 4 ++--
 demo/GUIViewer/GUIViewer_Demo.cfg                         | 4 ++--
 demo/GUIViewer/GUIViewer_Demo.prj                         | 4 ++--
 demo/HashMap/HashMap.cfg                                  | 4 ++--
 demo/HashMap/HashMap.prj                                  | 2 +-
 demo/HashMap/HashMap_demo.grp                             | 4 ++--
 demo/HashMap/HashMap_demo.ttcn                            | 4 ++--
 demo/HostAdmin/EPTF_HostAdmin_demo.cfg                    | 4 ++--
 demo/HostAdmin/EPTF_HostAdmin_demo.prj                    | 2 +-
 demo/HostAdmin/EPTF_HostAdmin_demo.ttcn                   | 4 ++--
 demo/HostAdmin/LOADMEASasp.grp                            | 4 ++--
 demo/HostAdmin/PIPEasp.grp                                | 4 ++--
 demo/HostAdmin/gui.xml                                    | 2 +-
 demo/HostAdmin/makefile_patch.sh                          | 4 ++--
 demo/ILog/EPTF_ILog_Applib_Definitions.ttcn               | 4 ++--
 demo/ILog/EPTF_ILog_Applib_Functions.ttcn                 | 4 ++--
 demo/ILog/EPTF_ILog_Application_Definitions.ttcn          | 4 ++--
 demo/ILog/EPTF_ILog_Application_Functions.ttcn            | 4 ++--
 demo/ILog/EPTF_ILog_Transport_Definitions.ttcn            | 4 ++--
 demo/ILog/EPTF_ILog_Transport_Functions.ttcn              | 4 ++--
 demo/ILog/EPTF_ILog_demo.cfg                              | 4 ++--
 demo/ILog/EPTF_ILog_demo.prj                              | 2 +-
 demo/ILog/EPTF_ILog_demo.tpd                              | 2 +-
 demo/ILog/EPTF_ILog_demo.ttcn                             | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo.cfg                       | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo.prj                       | 2 +-
 demo/LGenBase/EPTF_LGenBaseDemo_CallerDefinitions.ttcn    | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_CallerFunctions.ttcn      | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_Definitions.ttcn          | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_Functions.ttcn            | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_ResponderDefinitions.ttcn | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_ResponderFunctions.ttcn   | 4 ++--
 .../LGenBase/EPTF_LGenBaseDemo_SiblingFsmDefinitions.ttcn | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_SiblingFsmFunctions.ttcn  | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_TemplateFunctions.ttcn    | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_TransportDefinitions.ttcn | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_TransportFunctions.ttcn   | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_msgReRegisterTemplate.txt | 4 ++--
 demo/LGenBase/EPTF_LGenBaseDemo_msgRegisterTemplate.txt   | 4 ++--
 demo/LGenBase/Readme.txt                                  | 4 ++--
 demo/LoadRegulator/EPTF_LoadRegulator_demo.cfg            | 4 ++--
 demo/LoadRegulator/EPTF_LoadRegulator_demo.prj            | 2 +-
 demo/LoadRegulator/EPTF_LoadRegulator_demo.ttcn           | 4 ++--
 demo/Logging/EPTF_Logging_test.cfg                        | 4 ++--
 demo/Logging/EPTF_Logging_test.prj                        | 2 +-
 demo/Logging/EPTF_Logging_test.ttcn                       | 4 ++--
 demo/Logging/LoggingUI.cfg                                | 4 ++--
 demo/Logging/LoggingUI.prj                                | 2 +-
 demo/Logging/LoggingUI_Demo.ttcn                          | 4 ++--
 demo/Logging/Logging_Demo.grp                             | 4 ++--
 demo/Logging/TCCUsefulFunctions.grp                       | 4 ++--
 demo/Logging/TELNETasp.grp                                | 4 ++--
 demo/Logging/XTDPasp.grp                                  | 4 ++--
 demo/NameService/EPTF_NameService_test.prj                | 2 +-
 demo/NameService/EPTF_NameService_test.ttcn               | 4 ++--
 demo/PTCDeployment/EPTF_PTCDeployment_test.prj            | 2 +-
 demo/PTCDeployment/EPTF_PTCDeployment_test.ttcn           | 4 ++--
 demo/RandomNArray/EPTF_RNA.cfg                            | 4 ++--
 demo/RandomNArray/EPTF_RNA_Demo.prj                       | 2 +-
 demo/RandomNArray/EPTF_RNA_Demo.ttcn                      | 4 ++--
 demo/RedBlackTree/EPTF_RedBlackTree_demo.cfg              | 4 ++--
 demo/RedBlackTree/EPTF_RedBlackTree_demo.prj              | 2 +-
 demo/RedBlackTree/EPTF_RedBlackTree_demo.ttcn             | 4 ++--
 demo/RendezVous/EPTF_Rendezvous.prj                       | 2 +-
 demo/RendezVous/EPTF_Rendezvous_Demo.ttcn                 | 4 ++--
 demo/RendezVous/Rendezvous.cfg                            | 4 ++--
 demo/RingBuffer/MyMessageTypeRingBuffer_Functions.ttcnpp  | 4 ++--
 demo/RingBuffer/MyMessageTypeRingBuffer_demo.ttcn         | 4 ++--
 demo/RingBuffer/RingBuffer_Demo.prj                       | 2 +-
 demo/Scheduler/EPTF_Scheduler_test.prj                    | 2 +-
 demo/Scheduler/EPTF_Scheduler_test.ttcn                   | 4 ++--
 demo/Semaphore/EPTF_Semaphore_test.prj                    | 2 +-
 demo/Semaphore/EPTF_Semaphore_test.ttcn                   | 4 ++--
 .../EPTF_Applib_SimpleHello/demo/SimpleHello_Demo.ttcn    | 4 ++--
 .../EPTF_Applib_SimpleHello/demo/Simple_Hello.prj         | 2 +-
 .../EPTF_Applib_SimpleHello/demo/makefile_patch.sh        | 4 ++--
 .../EPTF_Applib_SimpleHello/demo/request_templ.txt        | 4 ++--
 demo/SimpleHello/EPTF_Applib_SimpleHello/demo/sh.cfg      | 4 ++--
 .../src/LoadGen/EPTF_SimpleHello_LGen_Definitions.ttcn    | 4 ++--
 .../src/LoadGen/EPTF_SimpleHello_LGen_Functions.ttcn      | 4 ++--
 .../src/Logger/EPTF_SimpleHello_Logger_Definitions.ttcn   | 4 ++--
 .../src/Logger/EPTF_SimpleHello_Logger_Functions.ttcn     | 4 ++--
 .../Transport/EPTF_SimpleHello_Transport_Definitions.ttcn | 4 ++--
 .../Transport/EPTF_SimpleHello_Transport_Functions.ttcn   | 4 ++--
 demo/SimpleHello/Readme                                   | 4 ++--
 .../src/EPTF_SimpleHello_Definitions.ttcn                 | 4 ++--
 demo/StatCapture/EPTF_StatCaptureControl_demo.ttcn        | 4 ++--
 demo/StatCapture/EPTF_StatCapture_demo.ttcn               | 4 ++--
 demo/StatCapture/StatCaptureTest.prj                      | 2 +-
 demo/StatCapture/main.cfg                                 | 4 ++--
 demo/StatHandler/EPTF_StatHandler_Demo.cfg                | 4 ++--
 demo/StatHandler/EPTF_StatHandler_Demo.prj                | 2 +-
 demo/StatHandler/EPTF_StatHandler_Demo.ttcn               | 4 ++--
 demo/StatManager/EPTF_StatManager_demo.prj                | 2 +-
 demo/StatManager/EPTF_StatManager_demo.ttcn               | 4 ++--
 demo/StatManager/main.cfg                                 | 4 ++--
 demo/StatMeasure/EPTF_StatMeasure_test.prj                | 2 +-
 demo/StatMeasure/EPTF_StatMeasure_test.ttcn               | 4 ++--
 demo/StatMeasure/UsefulFunctions.grp                      | 4 ++--
 demo/StatReplay/README.TXT                                | 4 ++--
 demo/StatReplay/StatReplay_Demo.cfg                       | 4 ++--
 demo/StatReplay/StatReplay_Demo.prj                       | 2 +-
 demo/StatReplay/testlog.txt                               | 4 ++--
 demo/TimeProfileEditor/TimeProfileEditor.cfg              | 4 ++--
 demo/TimeProfileEditor/TimeProfileEditor.prj              | 2 +-
 demo/TimeProfileEditor/edited_time_profiles.cfg           | 4 ++--
 demo/Transport/Transport_Demo.cfg                         | 4 ++--
 demo/Transport/Transport_Demo.prj                         | 2 +-
 demo/Transport/Transport_Demo.ttcn                        | 4 ++--
 demo/Transport/makefile_patch.sh                          | 4 ++--
 demo/UIHandler/Makefile_script                            | 4 ++--
 demo/UIHandler/README.TXT                                 | 4 ++--
 demo/UIHandler/Test1.launch                               | 4 ++--
 demo/UIHandler/UIHandler_DataSource_Demo.cfg              | 4 ++--
 demo/UIHandler/UIHandler_DataSource_Demo.prj              | 4 ++--
 demo/UIHandler/UI_Handler_Test.grp                        | 4 ++--
 demo/UIHandler/UI_Handler_Test.prj                        | 2 +-
 demo/UIHandler/UI_Handler_Test.ttcn                       | 4 ++--
 demo/UIHandler/cfg.cfg                                    | 4 ++--
 demo/Variable/DateTimeFunctions.grp                       | 4 ++--
 demo/Variable/EPTF_Var_SnapshotFile.cfg                   | 4 ++--
 demo/Variable/EPTF_Variable_test.prj                      | 2 +-
 demo/Variable/EPTF_Variable_test.ttcnpp                   | 4 ++--
 demo/Variable/FileIO.grp                                  | 4 ++--
 demo/Variable/PIPE.grp                                    | 4 ++--
 demo/Variable/Variable_Demo.grp                           | 4 ++--
 demo/Variable/main.cfg                                    | 4 ++--
 demo/WebGUI/EPTF_WebGUI_Demo.cfg                          | 4 ++--
 demo/WebGUI/EPTF_WebGUI_Demo.grp                          | 2 +-
 demo/WebGUI/EPTF_WebGUI_Demo.prj                          | 2 +-
 demo/WebGUI/EPTF_WebGUI_Demo.tpd                          | 2 +-
 demo/WebGUI/EPTF_WebGUI_Demo_Definitions.ttcn             | 4 ++--
 demo/WebGUI/EPTF_WebGUI_Demo_Functions.ttcn               | 4 ++--
 .../EPTF_WebGUI_Demo_ManyEntityGroupsAndScenarios.cfg     | 4 ++--
 demo/WebGUI/EPTF_WebGUI_Demo_Testcases.ttcn               | 4 ++--
 demo/WebGUI/python_test.py                                | 4 ++--
 doc/apidocSource/Menu.txt                                 | 4 ++--
 doc/apidocSource/TitanSim.html                            | 2 +-
 doc/apidocSource/index.html                               | 2 +-
 src/Base/EPTF_CLL_Base.grp                                | 4 ++--
 src/Base/EPTF_CLL_Base.tpd                                | 2 +-
 src/Base/EPTF_CLL_Base_Definitions.ttcn                   | 4 ++--
 src/Base/EPTF_CLL_Base_Dep.grp                            | 4 ++--
 src/Base/EPTF_CLL_Base_ExternalFunctions.cc               | 4 ++--
 src/Base/EPTF_CLL_Base_Functions.ttcn                     | 4 ++--
 src/Buffer/EPTF_CLL_Buffer.grp                            | 4 ++--
 src/Buffer/EPTF_CLL_Buffer.tpd                            | 2 +-
 src/Buffer/EPTF_CLL_Buffer_Definitions.ttcn               | 4 ++--
 src/Buffer/EPTF_CLL_Buffer_Dep.grp                        | 4 ++--
 src/Buffer/EPTF_CLL_Buffer_ExternalFunctions.cc           | 4 ++--
 src/Buffer/EPTF_CLL_Buffer_Functions.ttcn                 | 4 ++--
 src/CentralScheduling/EPTF_CLL_CSAdmin_Functions.ttcn     | 4 ++--
 src/CentralScheduling/EPTF_CLL_CSLB_Functions.ttcn        | 4 ++--
 .../EPTF_CLL_CSUIHandler_Definitions.ttcn                 | 4 ++--
 src/CentralScheduling/EPTF_CLL_CSUIHandler_Functions.ttcn | 4 ++--
 src/CentralScheduling/EPTF_CLL_CS_DSFunctions.ttcn        | 4 ++--
 src/CentralScheduling/EPTF_CLL_CS_Definitions.ttcn        | 4 ++--
 src/CentralScheduling/EPTF_CLL_CentralScheduling.grp      | 4 ++--
 src/CentralScheduling/EPTF_CLL_CentralScheduling.tpd      | 2 +-
 .../EPTF_CLL_CentralSchedulingUIHandler.grp               | 4 ++--
 .../EPTF_CLL_CentralSchedulingUIHandler.tpd               | 2 +-
 .../EPTF_CLL_CentralSchedulingUIHandler_Dep.grp           | 4 ++--
 src/CentralScheduling/EPTF_CLL_CentralScheduling_Dep.grp  | 4 ++--
 src/CommandLineInterface/EPTF_CLL_CLI.grp                 | 4 ++--
 src/CommandLineInterface/EPTF_CLL_CLI.tpd                 | 2 +-
 src/CommandLineInterface/EPTF_CLL_CLI_Definitions.ttcn    | 4 ++--
 src/CommandLineInterface/EPTF_CLL_CLI_Functions.ttcn      | 4 ++--
 .../EPTF_CLL_CommandLineInterface_Dep.grp                 | 4 ++--
 src/Common/EPTF_CLL_Common.grp                            | 4 ++--
 src/Common/EPTF_CLL_Common.tpd                            | 2 +-
 src/Common/EPTF_CLL_Common_Definitions.ttcn               | 4 ++--
 src/Common/EPTF_CLL_Common_Dep.grp                        | 4 ++--
 src/Common/EPTF_CLL_Common_ExternalFunctions.cc           | 4 ++--
 src/Common/EPTF_CLL_Common_Functions.ttcn                 | 4 ++--
 src/Common/EPTF_CLL_Common_IndexArrayDefinitions.ttcn     | 4 ++--
 src/Common/EPTF_CLL_Common_IndexArrayFunctions.ttcn       | 4 ++--
 src/Common/EPTF_CLL_Common_PrivateDebugDefinitions.ttcnpp | 4 ++--
 src/Common/EPTF_CLL_Common_RndDefinitions.ttcn            | 4 ++--
 src/Common/EPTF_CLL_Common_RndFunctions.ttcn              | 4 ++--
 src/DataSource/EPTF_CLL_DataSource.grp                    | 4 ++--
 src/DataSource/EPTF_CLL_DataSource.tpd                    | 2 +-
 src/DataSource/EPTF_CLL_DataSourceClient_Functions.ttcn   | 4 ++--
 src/DataSource/EPTF_CLL_DataSource_Apidoc.ttcn            | 4 ++--
 src/DataSource/EPTF_CLL_DataSource_Definitions.ttcn       | 4 ++--
 src/DataSource/EPTF_CLL_DataSource_Dep.grp                | 4 ++--
 src/DataSource/EPTF_CLL_DataSource_ExternalFunctions.cc   | 4 ++--
 src/DataSource/EPTF_CLL_DataSource_Functions.ttcn         | 8 ++++----
 src/DsRestAPI/Api/Js/DsRestAPI.js                         | 4 ++--
 src/DsRestAPI/Api/Js/DsRestAPIComm.js                     | 4 ++--
 src/DsRestAPI/Api/Python/DsRestAPI.py                     | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI.grp                      | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI.tpd                      | 2 +-
 .../EPTF_CLL_DsRestAPI_DSServer_Definitions.ttcn          | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_DSServer_Functions.ttcn  | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Definitions.ttcn         | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Dep.grp                  | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_ExternalFunctions.cc     | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Definitions.ttcn  | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Filter_Functions.ttcn    | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Functions.ttcn           | 4 ++--
 .../EPTF_CLL_DsRestAPI_HTTPServer_Definitions.ttcn        | 4 ++--
 .../EPTF_CLL_DsRestAPI_HTTPServer_Functions.ttcn          | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Definitions.ttcn | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Storage_Functions.ttcn   | 4 ++--
 .../EPTF_CLL_DsRestAPI_Timeline_Definitions.ttcn          | 4 ++--
 .../EPTF_CLL_DsRestAPI_Timeline_ExternalFunctions.cc      | 4 ++--
 src/DsRestAPI/EPTF_CLL_DsRestAPI_Timeline_Functions.ttcn  | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl.grp                        | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl.tpd                        | 2 +-
 src/ExecCtrl/EPTF_CLL_ExecCtrlClient_Functions.ttcn       | 4 ++--
 .../EPTF_CLL_ExecCtrlTimeProfile_Definitions.ttcn         | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler.grp               | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Definitions.ttcn  | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Dep.grp           | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrlUIHandler_Functions.ttcn    | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIDefinitions.ttcn        | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_CLIFunctions.ttcn          | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_DSFunctions.ttcn           | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_Definitions.ttcn           | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_Dep.grp                    | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_Functions.ttcn             | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_LoggingFunctions.ttcn      | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseDefinitions.ttcn      | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_PhaseFunctions.ttcn        | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioDefinitions.ttcn   | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_ScenarioFunctions.ttcn     | 4 ++--
 src/ExecCtrl/EPTF_CLL_ExecCtrl_UI.tpd                     | 2 +-
 src/FreeBusyQueue/EPTF_CLL_FBQ.tpd                        | 2 +-
 src/FreeBusyQueue/EPTF_CLL_FBQ_Definitions.ttcn           | 4 ++--
 src/FreeBusyQueue/EPTF_CLL_FBQ_Functions.ttcn             | 4 ++--
 src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue.grp              | 4 ++--
 src/FreeBusyQueue/EPTF_CLL_FreeBusyQueue_Dep.grp          | 4 ++--
 src/GUIViewer/EPTF_CLL_GUIViewer.grp                      | 4 ++--
 src/GUIViewer/EPTF_CLL_GUIViewer.tpd                      | 2 +-
 src/GUIViewer/EPTF_CLL_GUIViewer.xml                      | 2 +-
 src/GUIViewer/EPTF_CLL_GUIViewer_Functions.ttcn           | 4 ++--
 src/HashMap/EPTF_CLL_HashMap.grp                          | 4 ++--
 src/HashMap/EPTF_CLL_HashMap.tpd                          | 2 +-
 src/HashMap/EPTF_CLL_HashMapInt2Int_ExternalFunctions.cc  | 4 ++--
 src/HashMap/EPTF_CLL_HashMapInt2Int_Functions.ttcn        | 4 ++--
 src/HashMap/EPTF_CLL_HashMapOct2Int_ExternalFunctions.cc  | 4 ++--
 src/HashMap/EPTF_CLL_HashMapOct2Int_Functions.ttcn        | 4 ++--
 src/HashMap/EPTF_CLL_HashMapStr2Int_ExternalFunctions.cc  | 4 ++--
 src/HashMap/EPTF_CLL_HashMapStr2Int_Functions.ttcn        | 4 ++--
 src/HashMap/EPTF_CLL_HashMap_Definitions.ttcn             | 4 ++--
 src/HashMap/EPTF_CLL_HashMap_Dep.grp                      | 4 ++--
 src/HashMap/EPTF_CLL_HashMap_ExternalFunctions.hh         | 4 ++--
 src/HashMap/EPTF_CLL_HashMap_Functions.ttcn               | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin.grp                      | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin.tpd                      | 2 +-
 src/HostAdmin/EPTF_CLL_HostAdminServer_Definitions.ttcn   | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdminServer_Functions.ttcn     | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdminUI.grp                    | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdminUIHandler_Dep.grp         | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdminUI_Definitions.ttcn       | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdminUI_Functions.ttcn         | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_BaseDefinitions.ttcn     | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_BaseFunctions.ttcn       | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_DSFunctions.ttcn         | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_Definitions.ttcn         | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_Dep.grp                  | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_Functions.ttcn           | 4 ++--
 src/HostAdmin/EPTF_CLL_HostAdmin_UI.tpd                   | 2 +-
 src/ILog/EPTF_CLL_ILog.grp                                | 4 ++--
 src/ILog/EPTF_CLL_ILog.tpd                                | 2 +-
 src/ILog/EPTF_CLL_ILogString.grp                          | 4 ++--
 src/ILog/EPTF_CLL_ILogString.tpd                          | 2 +-
 src/ILog/EPTF_CLL_ILogString_Definitions.ttcn             | 4 ++--
 src/ILog/EPTF_CLL_ILogString_Functions.ttcn               | 4 ++--
 src/ILog/EPTF_CLL_ILog_Definitions.ttcn                   | 4 ++--
 src/ILog/EPTF_CLL_ILog_Functions.ttcn                     | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase.grp                        | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase.tpd                        | 2 +-
 src/LGenBase/EPTF_CLL_LGenBaseStats.grp                   | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseStatsUI.grp                 | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Definitions.ttcn    | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseStatsUI_Functions.ttcn      | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseStats_Definitions.ttcn      | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseStats_Functions.ttcn        | 4 ++--
 .../EPTF_CLL_LGenBaseTrafficMixer_Definitions.ttcn        | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseTrafficMixer_Functions.ttcn | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBaseUIHandler_Dep.grp           | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_All.grp                    | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_ConfigDefinitions.ttcn     | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_ConfigFunctions.ttcn       | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_DSFunctions.ttcn           | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_Definitions.ttcn           | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_Dep.grp                    | 4 ++--
 .../EPTF_CLL_LGenBase_EventHandlingExternalFunctions.cc   | 4 ++--
 .../EPTF_CLL_LGenBase_EventHandlingFunctions.ttcn         | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_External.grp               | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_ExternalFunctions.ttcn     | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_Functions.ttcn             | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_ILog_Definitions.ttcn      | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_ILog_Functions.ttcn        | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_LoggingDefinitions.ttcn    | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_LoggingFunctions.ttcn      | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_PhaseConfigFunctions.ttcn  | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_PhaseDefinitions.ttcn      | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_PhaseFunctions.ttcn        | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_StepFunctions.ttcn         | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_TemplateDefinitions.ttcn   | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_TemplateFunctions.ttcn     | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_TrafficFunctions.ttcn      | 4 ++--
 src/LGenBase/EPTF_CLL_LGenBase_UI.tpd                     | 2 +-
 src/LoadRegulator/EPTF_CLL_LoadRegulator.grp              | 4 ++--
 src/LoadRegulator/EPTF_CLL_LoadRegulator.tpd              | 2 +-
 src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.grp            | 4 ++--
 src/LoadRegulator/EPTF_CLL_LoadRegulatorUI.tpd            | 2 +-
 src/LoadRegulator/EPTF_CLL_LoadRegulatorUIHandler_Dep.grp | 4 ++--
 .../EPTF_CLL_LoadRegulatorUI_Definitions.ttcn             | 4 ++--
 src/LoadRegulator/EPTF_CLL_LoadRegulatorUI_Functions.ttcn | 4 ++--
 src/LoadRegulator/EPTF_CLL_LoadRegulator_Definitions.ttcn | 4 ++--
 src/LoadRegulator/EPTF_CLL_LoadRegulator_Dep.grp          | 4 ++--
 src/LoadRegulator/EPTF_CLL_LoadRegulator_Functions.ttcn   | 4 ++--
 src/Logging/EPTF_CLL_Logging.grp                          | 4 ++--
 src/Logging/EPTF_CLL_Logging.tpd                          | 2 +-
 src/Logging/EPTF_CLL_LoggingCS.grp                        | 4 ++--
 src/Logging/EPTF_CLL_LoggingCS_Dep.grp                    | 4 ++--
 src/Logging/EPTF_CLL_LoggingClient_Functions.ttcn         | 4 ++--
 src/Logging/EPTF_CLL_LoggingServer_Definitions.ttcn       | 4 ++--
 src/Logging/EPTF_CLL_LoggingServer_Functions.ttcn         | 4 ++--
 src/Logging/EPTF_CLL_LoggingUI.grp                        | 4 ++--
 src/Logging/EPTF_CLL_LoggingUIClient_Functions.ttcn       | 4 ++--
 src/Logging/EPTF_CLL_LoggingUIHandler_Dep.grp             | 4 ++--
 src/Logging/EPTF_CLL_LoggingUI_Definitions.ttcn           | 4 ++--
 src/Logging/EPTF_CLL_LoggingUI_Functions.ttcn             | 4 ++--
 src/Logging/EPTF_CLL_LoggingUI_PrivateFunctions.ttcn      | 4 ++--
 src/Logging/EPTF_CLL_Logging_Client.tpd                   | 2 +-
 src/Logging/EPTF_CLL_Logging_Definitions.ttcn             | 4 ++--
 src/Logging/EPTF_CLL_Logging_Dep.grp                      | 4 ++--
 src/Logging/EPTF_CLL_Logging_Functions.ttcn               | 4 ++--
 src/Logging/EPTF_CLL_Logging_Server.tpd                   | 2 +-
 src/Logging/EPTF_CLL_Logging_UI.tpd                       | 2 +-
 src/NQueue/EPTF_CLL_NQueue.grp                            | 4 ++--
 src/NQueue/EPTF_CLL_NQueue.tpd                            | 2 +-
 src/NQueue/EPTF_CLL_NQueue_Definitions.ttcn               | 4 ++--
 src/NQueue/EPTF_CLL_NQueue_ExternalFunctions.cc           | 4 ++--
 src/NQueue/EPTF_CLL_NQueue_Functions.ttcn                 | 4 ++--
 src/NameService/EPTF_CLL_NameService.grp                  | 4 ++--
 src/NameService/EPTF_CLL_NameService.tpd                  | 2 +-
 src/NameService/EPTF_CLL_NameServiceClient_Functions.ttcn | 4 ++--
 src/NameService/EPTF_CLL_NameService_Definitions.ttcn     | 4 ++--
 src/NameService/EPTF_CLL_NameService_Dep.grp              | 4 ++--
 src/NameService/EPTF_CLL_NameService_ExternalFunctions.cc | 4 ++--
 src/NameService/EPTF_CLL_NameService_Functions.ttcn       | 4 ++--
 src/PTCDeployment/EPTF_CLL_PTCDeployment.grp              | 4 ++--
 src/PTCDeployment/EPTF_CLL_PTCDeployment.tpd              | 2 +-
 src/PTCDeployment/EPTF_CLL_PTCDeployment_Definitions.ttcn | 4 ++--
 src/PTCDeployment/EPTF_CLL_PTCDeployment_Dep.grp          | 4 ++--
 src/PTCDeployment/EPTF_CLL_PTCDeployment_Functions.ttcn   | 4 ++--
 .../EPTF_CLL_PTCDeployment_PrivateFunctions.ttcn          | 4 ++--
 src/RandomNArray/EPTF_CLL_RNA.grp                         | 4 ++--
 src/RandomNArray/EPTF_CLL_RNA_Definitions.ttcn            | 4 ++--
 src/RandomNArray/EPTF_CLL_RNA_Functions.ttcn              | 4 ++--
 src/RandomNArray/EPTF_CLL_RandomNArray.tpd                | 2 +-
 src/RandomNArray/EPTF_CLL_RandomNArray_Dep.grp            | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBT.grp                         | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBT_Definitions.ttcn            | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBT_ExternalFunctions.cc        | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBT_Functions.ttcn              | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree.grp                      | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtreeFloat.grp                 | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtreeFloat_Functions.ttcn      | 4 ++--
 .../EPTF_CLL_RBtreeFloat_PrivateFunctions.ttcn            | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtreeInteger.grp               | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtreeInteger_Functions.ttcn    | 4 ++--
 .../EPTF_CLL_RBtreeInteger_PrivateFunctions.ttcn          | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree_Definitions.ttcn         | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree_Float.grp                | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree_Functions.ttcn           | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree_General.grp              | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree_Integer.grp              | 4 ++--
 src/RedBlackTree/EPTF_CLL_RBtree_PrivateFunctions.ttcn    | 4 ++--
 src/RedBlackTree/EPTF_CLL_RedBlackTree.tpd                | 2 +-
 src/RedBlackTree/EPTF_CLL_RedBlackTree_Dep.grp            | 4 ++--
 src/Rendezvous/EPTF_CLL_Rendezvous.grp                    | 4 ++--
 src/Rendezvous/EPTF_CLL_Rendezvous.tpd                    | 2 +-
 src/Rendezvous/EPTF_CLL_RendezvousClient_Functions.ttcn   | 4 ++--
 src/Rendezvous/EPTF_CLL_Rendezvous_Definitions.ttcn       | 4 ++--
 src/Rendezvous/EPTF_CLL_Rendezvous_Dep.grp                | 4 ++--
 src/Rendezvous/EPTF_CLL_Rendezvous_Functions.ttcn         | 4 ++--
 .../EPTF_CLL_GenericRingBuffer_Definitions.ttcnin         | 4 ++--
 .../EPTF_CLL_GenericRingBuffer_Functions.ttcnin           | 4 ++--
 src/RingBuffer/EPTF_CLL_IntegerRingBuffer_Functions.ttcn  | 4 ++--
 src/RingBuffer/EPTF_CLL_RingBuffer.grp                    | 4 ++--
 src/RingBuffer/EPTF_CLL_RingBuffer.tpd                    | 2 +-
 src/RingBuffer/EPTF_CLL_RingBuffer_Definitions.ttcn       | 4 ++--
 src/RingBuffer/EPTF_CLL_RingBuffer_Dep.grp                | 4 ++--
 src/RingBuffer/EPTF_CLL_RingBuffer_PrivateFunctions.ttcn  | 4 ++--
 src/SMacro/EPTF_CLL_SMacro.grp                            | 4 ++--
 src/SMacro/EPTF_CLL_SMacro.tpd                            | 2 +-
 src/SMacro/EPTF_CLL_SMacro_Definitions.ttcn               | 4 ++--
 src/SMacro/EPTF_CLL_SMacro_Dep.grp                        | 4 ++--
 src/SMacro/EPTF_CLL_SMacro_ExternalFunctions.cc           | 4 ++--
 src/SMacro/EPTF_CLL_SMacro_Functions.ttcn                 | 4 ++--
 src/Scheduler/EPTF_CLL_RBTScheduler_Definitions.ttcn      | 4 ++--
 src/Scheduler/EPTF_CLL_RBTScheduler_Functions.ttcn        | 4 ++--
 src/Scheduler/EPTF_CLL_Scheduler.grp                      | 4 ++--
 src/Scheduler/EPTF_CLL_Scheduler.tpd                      | 2 +-
 src/Scheduler/EPTF_CLL_Scheduler_Definitions.ttcn         | 4 ++--
 src/Scheduler/EPTF_CLL_Scheduler_Dep.grp                  | 4 ++--
 src/Scheduler/EPTF_CLL_Scheduler_FBQ.grp                  | 4 ++--
 src/Scheduler/EPTF_CLL_Scheduler_General.grp              | 4 ++--
 src/Scheduler/EPTF_CLL_Scheduler_RBT.grp                  | 4 ++--
 src/Scheduler/EPTF_FBQScheduler.grp                       | 4 ++--
 src/Scheduler/EPTF_RBTScheduler.grp                       | 4 ++--
 src/Semaphore/EPTF_CLL_Semaphore.grp                      | 4 ++--
 src/Semaphore/EPTF_CLL_Semaphore.tpd                      | 2 +-
 src/Semaphore/EPTF_CLL_Semaphore_Definitions.ttcn         | 4 ++--
 src/Semaphore/EPTF_CLL_Semaphore_Dep.grp                  | 4 ++--
 src/Semaphore/EPTF_CLL_Semaphore_Functions.ttcn           | 4 ++--
 src/StatCapture/EPTF_CLL_StatCapture.grp                  | 4 ++--
 src/StatCapture/EPTF_CLL_StatCapture.tpd                  | 2 +-
 src/StatCapture/EPTF_CLL_StatCaptureControl.grp           | 4 ++--
 src/StatCapture/EPTF_CLL_StatCaptureControl.tpd           | 2 +-
 .../EPTF_CLL_StatCaptureControl_Definitions.ttcn          | 4 ++--
 .../EPTF_CLL_StatCaptureControl_Functions.ttcn            | 4 ++--
 src/StatCapture/EPTF_CLL_StatCaptureUI.grp                | 4 ++--
 src/StatCapture/EPTF_CLL_StatCaptureUI.tpd                | 2 +-
 src/StatCapture/EPTF_CLL_StatCaptureUIHandler_Dep.grp     | 4 ++--
 src/StatCapture/EPTF_CLL_StatCaptureUI_Definitions.ttcn   | 4 ++--
 src/StatCapture/EPTF_CLL_StatCaptureUI_Functions.ttcn     | 4 ++--
 src/StatCapture/EPTF_CLL_StatCapture_Definitions.ttcn     | 4 ++--
 src/StatCapture/EPTF_CLL_StatCapture_Dep.grp              | 4 ++--
 src/StatCapture/EPTF_CLL_StatCapture_ExternalFunctions.cc | 4 ++--
 src/StatCapture/EPTF_CLL_StatCapture_Functions.ttcn       | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler.grp                  | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler.tpd                  | 2 +-
 .../EPTF_CLL_StatHandlerClient_Definitions.ttcn           | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandlerClient_Functions.ttcn | 4 ++--
 .../EPTF_CLL_StatHandlerLogging_Definitions.ttcn          | 4 ++--
 .../EPTF_CLL_StatHandlerLogging_Functions.ttcn            | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandlerUI.grp                | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandlerUIHandler_Dep.grp     | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandlerUI_Definitions.ttcn   | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandlerUI_Functions.ttcn     | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler_DSFunctions.ttcn     | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler_Definitions.ttcn     | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler_Dep.grp              | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler_ExternalFunctions.cc | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler_Functions.ttcn       | 4 ++--
 src/StatHandler/EPTF_CLL_StatHandler_UI.tpd               | 2 +-
 src/StatManager/EPTF_CLL_StatManager.grp                  | 4 ++--
 src/StatManager/EPTF_CLL_StatManager.tpd                  | 2 +-
 src/StatManager/EPTF_CLL_StatManager_Definitions.ttcn     | 4 ++--
 src/StatManager/EPTF_CLL_StatManager_Dep.grp              | 4 ++--
 src/StatManager/EPTF_CLL_StatManager_Functions.ttcn       | 4 ++--
 src/StatMeasure/EPTF_CLL_StatMeasure.grp                  | 4 ++--
 src/StatMeasure/EPTF_CLL_StatMeasure.tpd                  | 2 +-
 src/StatMeasure/EPTF_CLL_StatMeasure_Definitions.ttcn     | 4 ++--
 src/StatMeasure/EPTF_CLL_StatMeasure_Dep.grp              | 4 ++--
 src/StatMeasure/EPTF_CLL_StatMeasure_Functions.ttcn       | 4 ++--
 src/StatMeasure/UsefulFunctions.grp                       | 4 ++--
 src/StatReplay/EPTF_CLL_StatReplay.grp                    | 4 ++--
 src/StatReplay/EPTF_CLL_StatReplay.tpd                    | 2 +-
 src/StatReplay/EPTF_CLL_StatReplay_Definitions.ttcnpp     | 4 ++--
 src/StatReplay/EPTF_CLL_StatReplay_Dep.grp                | 4 ++--
 src/StatReplay/EPTF_CLL_StatReplay_Execution.ttcn         | 4 ++--
 src/StatReplay/EPTF_CLL_StatReplay_Functions.ttcn         | 4 ++--
 src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.grp      | 4 ++--
 src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.tpd      | 2 +-
 src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor.ttcn     | 4 ++--
 .../EPTF_CLL_TimeProfileEditor_Definitions.ttcn           | 4 ++--
 src/TimeProfileEditor/EPTF_CLL_TimeProfileEditor_Dep.grp  | 4 ++--
 .../EPTF_CLL_TimeProfileEditor_Functions.ttcn             | 4 ++--
 .../EPTF_CLL_TimeProfileEditor_XTDPTemplates.ttcn         | 4 ++--
 src/Transport/EPTF_CLL_Transport.grp                      | 4 ++--
 src/Transport/EPTF_CLL_Transport.tpd                      | 2 +-
 src/Transport/EPTF_CLL_TransportCommPortIPL4.grp          | 4 ++--
 .../EPTF_CLL_TransportCommPortIPL4_Definitions.ttcn       | 4 ++--
 .../EPTF_CLL_TransportCommPortIPL4_Functions.ttcn         | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL2.grp                  | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL2_Definitions.ttcn     | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL2_ExternalFunctions.cc | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL2_Functions.ttcn       | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL4.grp                  | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL4_Definitions.ttcn     | 4 ++--
 src/Transport/EPTF_CLL_TransportIPL4_Functions.ttcn       | 4 ++--
 src/Transport/EPTF_CLL_TransportIPsecHandler.grp          | 4 ++--
 src/Transport/EPTF_CLL_TransportMessageBufferManager.grp  | 4 ++--
 ...PTF_CLL_TransportMessageBufferManager_Definitions.ttcn | 4 ++--
 .../EPTF_CLL_TransportMessageBufferManager_Functions.ttcn | 4 ++--
 src/Transport/EPTF_CLL_TransportRouting.grp               | 4 ++--
 src/Transport/EPTF_CLL_TransportRouting.tpd               | 2 +-
 src/Transport/EPTF_CLL_TransportRouting_Definitions.ttcn  | 4 ++--
 src/Transport/EPTF_CLL_TransportRouting_Functions.ttcn    | 4 ++--
 src/Transport/EPTF_CLL_Transport_CommPortIPL4.tpd         | 2 +-
 src/Transport/EPTF_CLL_Transport_Common.grp               | 4 ++--
 src/Transport/EPTF_CLL_Transport_Common.tpd               | 2 +-
 src/Transport/EPTF_CLL_Transport_CommonDefinitions.ttcn   | 4 ++--
 src/Transport/EPTF_CLL_Transport_Definitions.ttcn         | 4 ++--
 src/Transport/EPTF_CLL_Transport_Dep.grp                  | 4 ++--
 src/Transport/EPTF_CLL_Transport_Functions.ttcn           | 4 ++--
 src/Transport/EPTF_CLL_Transport_IPL2.tpd                 | 2 +-
 src/Transport/EPTF_CLL_Transport_IPL4.tpd                 | 2 +-
 src/Transport/EPTF_CLL_Transport_IPsecHandler.tpd         | 2 +-
 .../EPTF_CLL_Transport_IPsecHandler_Definitions.ttcn      | 4 ++--
 .../EPTF_CLL_Transport_IPsecHandler_Functions.ttcn        | 4 ++--
 ...Transport_IPsecHandler_Logging_Client_Definitions.ttcn | 4 ++--
 ...L_Transport_IPsecHandler_Logging_Client_Functions.ttcn | 4 ++--
 ..._Transport_IPsecHandler_Logging_CommonDefinitions.ttcn | 4 ++--
 ...TF_CLL_Transport_IPsecHandler_Logging_Definitions.ttcn | 4 ++--
 ...EPTF_CLL_Transport_IPsecHandler_Logging_Functions.ttcn | 4 ++--
 ...Transport_IPsecHandler_Logging_Server_Definitions.ttcn | 4 ++--
 ...L_Transport_IPsecHandler_Logging_Server_Functions.ttcn | 4 ++--
 src/Transport/EPTF_CLL_Transport_MessageBufferManager.tpd | 2 +-
 src/UIHandler/EPTF_CLL_UIHandler.grp                      | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler.tpd                      | 2 +-
 .../EPTF_CLL_UIHandlerCLI_CommandDefinitions.ttcn         | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandlerCLI_Definitions.ttcn      | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandlerCLI_Functions.ttcn        | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandlerClient_Definitions.ttcn   | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandlerClient_Functions.ttcn     | 4 ++--
 .../EPTF_CLL_UIHandlerVariableUI_Definitions.ttcn         | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandlerVariableUI_Functions.ttcn | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_Base.grp                 | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_Base_Dep.grp             | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_Browser.grp              | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_BrowserFunctions.ttcn    | 4 ++--
 .../EPTF_CLL_UIHandler_CLIClientDefinitions.ttcn          | 4 ++--
 ...F_CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcn | 4 ++--
 ...CLL_UIHandler_ChartDataTypeRingBuffer_Functions.ttcnpp | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_ConvertFunctions.ttcn    | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_DS_Definitions.ttcn      | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_DS_Functions.ttcn        | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_Definitions.ttcn         | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_Dep.grp                  | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_ExternalFunctions.cc     | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.cc          | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_GUIFunctions.hh          | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_MsgDefinitions.ttcn      | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_PrivateFunctions.ttcn    | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_WidgetFunctions.ttcn     | 4 ++--
 .../EPTF_CLL_UIHandler_XSD_XTDPTemplateDefinitions.ttcn   | 4 ++--
 .../EPTF_CLL_UIHandler_XTDPTemplateDefinitions.ttcn       | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_XUL.grp                  | 4 ++--
 src/UIHandler/EPTF_CLL_UIHandler_XULFunctions.ttcn        | 4 ++--
 src/UIHandler/EPTF_CLL_Variable_UI.tpd                    | 2 +-
 src/UIHandler/XTDPasp.grp                                 | 4 ++--
 src/Variable/EPTF_CLL_Variable.grp                        | 4 ++--
 src/Variable/EPTF_CLL_Variable.tpd                        | 2 +-
 src/Variable/EPTF_CLL_Variable_Definitions.ttcn           | 4 ++--
 src/Variable/EPTF_CLL_Variable_Dep.grp                    | 4 ++--
 src/Variable/EPTF_CLL_Variable_ExternalFunctions.cc       | 4 ++--
 src/Variable/EPTF_CLL_Variable_Functions.ttcn             | 4 ++--
 test/Base/EPTF_Base_Test.cfg                              | 4 ++--
 test/Base/EPTF_Base_Test.prj                              | 2 +-
 test/Base/EPTF_Base_Test.tpd                              | 2 +-
 test/Base/EPTF_Base_Test_Definitions.ttcn                 | 4 ++--
 test/Base/EPTF_Base_Test_Functions.ttcn                   | 4 ++--
 test/Base/EPTF_Base_Test_Testcases.ttcn                   | 4 ++--
 test/Base/EPTF_Base_restartPart1_Test.cfg                 | 4 ++--
 test/Base/EPTF_Base_restartPart1_Test.prj                 | 2 +-
 test/Base/EPTF_Base_restartPart1_Test.tpd                 | 2 +-
 test/Base/EPTF_Base_restartPart1_Test_Testcases.ttcn      | 4 ++--
 test/Base/EPTF_Base_restartPart2_Test.cfg                 | 4 ++--
 test/Base/EPTF_Base_restartPart2_Test.prj                 | 2 +-
 test/Base/EPTF_Base_restartPart2_Test.tpd                 | 2 +-
 test/Base/EPTF_Base_restartPart2_Test_Testcases.ttcn      | 4 ++--
 test/Base/smokeTests.txt                                  | 4 ++--
 test/Buffer/Buffer_Test.grp                               | 4 ++--
 test/Buffer/EPTF_Buffer.cfg                               | 4 ++--
 test/Buffer/EPTF_Buffer_Test.prj                          | 2 +-
 test/Buffer/EPTF_Buffer_Test.tpd                          | 2 +-
 test/Buffer/EPTF_CLL_Buffer_Test_Testcases.ttcn           | 4 ++--
 test/Buffer/smokeTests.txt                                | 4 ++--
 test/CentralScheduling/CentralScheduling_Gui.xml          | 2 +-
 test/CentralScheduling/EPTF_CS_Test.cfg                   | 4 ++--
 test/CentralScheduling/EPTF_CS_Test_Definitions.ttcn      | 4 ++--
 test/CentralScheduling/EPTF_CS_Test_Functions.ttcn        | 4 ++--
 test/CentralScheduling/EPTF_CS_Test_Tescases.ttcn         | 4 ++--
 test/CommandLineInterface/EPTF_CLI_Test.grp               | 4 ++--
 test/CommandLineInterface/EPTF_CLI_Test.prj               | 2 +-
 test/CommandLineInterface/EPTF_CLI_Test.tpd               | 2 +-
 test/CommandLineInterface/EPTF_CLI_Test.ttcn              | 4 ++--
 test/CommandLineInterface/EPTF_CLI_Test_Definitions.ttcn  | 4 ++--
 test/CommandLineInterface/EPTF_CLI_Test_Functions.ttcn    | 4 ++--
 test/CommandLineInterface/Makefile_patch.sh               | 4 ++--
 test/CommandLineInterface/cli.cfg                         | 4 ++--
 test/CommandLineInterface/smokeTests.txt                  | 4 ++--
 test/Common/CompileTest_AppLibs.grp                       | 4 ++--
 test/Common/CompileTest_AppLibs.prj                       | 2 +-
 test/Common/CompileTest_AppLibs_patch.sh                  | 4 ++--
 test/Common/CompileTest_all.prj                           | 2 +-
 test/Common/CompileTest_all.tpd                           | 2 +-
 test/Common/CompileTest_demo.grp                          | 4 ++--
 test/Common/CompileTest_makefile_patch.sh                 | 4 ++--
 test/Common/CompileTest_src.grp                           | 4 ++--
 test/Common/EPTF_Common_IndexArray_Test.cfg               | 4 ++--
 test/Common/EPTF_Common_IndexArray_Test.prj               | 2 +-
 test/Common/EPTF_Common_IndexArray_Test.tpd               | 2 +-
 test/Common/EPTF_Common_IndexArray_Test_Definitions.ttcn  | 4 ++--
 test/Common/EPTF_Common_IndexArray_Test_Functions.ttcn    | 4 ++--
 test/Common/EPTF_Common_IndexArray_Test_Testcases.ttcn    | 4 ++--
 test/Common/EPTF_Common_Test.cfg                          | 4 ++--
 test/Common/EPTF_Common_Test.prj                          | 2 +-
 test/Common/EPTF_Common_Test.tpd                          | 2 +-
 test/Common/EPTF_Common_Test_Definitions.ttcn             | 4 ++--
 test/Common/EPTF_Common_Test_Functions.ttcn               | 4 ++--
 test/Common/EPTF_Common_Test_Testcases.ttcn               | 4 ++--
 test/Common/Makefile                                      | 4 ++--
 test/Common/smokeTests.txt                                | 4 ++--
 test/Common/smokeTestsIA.txt                              | 4 ++--
 test/DataSource/DSTestGUI.xml                             | 2 +-
 test/DataSource/EPTF_DataSource_Test.cfg                  | 4 ++--
 test/DataSource/EPTF_DataSource_Test.grp                  | 4 ++--
 test/DataSource/EPTF_DataSource_Test.prj                  | 2 +-
 test/DataSource/EPTF_DataSource_Test.tpd                  | 2 +-
 test/DataSource/EPTF_DataSource_Test_Definitions.ttcn     | 4 ++--
 test/DataSource/EPTF_DataSource_Test_Functions.ttcn       | 4 ++--
 test/DataSource/EPTF_DataSource_Test_Testcases.ttcn       | 4 ++--
 test/DataSource/HN97107.xml                               | 2 +-
 test/DataSource/Makefile_script                           | 4 ++--
 test/DataSource/smokeTests.txt                            | 4 ++--
 test/DsRestAPI/DsRestAPI_stdout.py                        | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_PerfTest.cfg                | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_PerfTest.grp                | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_PerfTest.prj                | 2 +-
 test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Definitions.ttcn   | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Functions.ttcn     | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_PerfTest_Testcases.ttcn     | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_Test.cfg                    | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_Test.grp                    | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_Test.prj                    | 2 +-
 test/DsRestAPI/EPTF_DsRestAPI_Test.tpd                    | 2 +-
 test/DsRestAPI/EPTF_DsRestAPI_Test_Definitions.ttcn       | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_Test_ExternalFunctions.cc   | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_Test_Functions.ttcn         | 4 ++--
 test/DsRestAPI/EPTF_DsRestAPI_Test_Testcases.ttcn         | 4 ++--
 test/DsRestAPI/PerfTest/storePerformanceResults.sh        | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_CLITest_Definitions.ttcn      | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_CLITest_TestCases.ttcn        | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest.cfg            | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUpTest_Testcases.ttcn | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_GUIBuildUp_PerfTest.prj       | 2 +-
 .../EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.cfg         | 4 ++--
 .../EPTF_ExecCtrl_PullModelDsRestAPI_PerfTest.prj         | 2 +-
 ..._ExecCtrl_PullModelDsRestAPI_PerfTest_Definitions.ttcn | 4 ++--
 ...cCtrl_PullModelDsRestAPI_PerfTest_ExternalFunctions.cc | 4 ++--
 ...TF_ExecCtrl_PullModelDsRestAPI_PerfTest_Functions.ttcn | 4 ++--
 ...TF_ExecCtrl_PullModelDsRestAPI_PerfTest_Testcases.ttcn | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.cfg        | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_PullModel_PerfTest.prj        | 2 +-
 .../EPTF_ExecCtrl_PullModel_PerfTest_Definitions.ttcn     | 4 ++--
 .../EPTF_ExecCtrl_PullModel_PerfTest_Functions.ttcn       | 4 ++--
 .../EPTF_ExecCtrl_PullModel_PerfTest_Testcases.ttcn       | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_Test.cfg                      | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_Test.prj                      | 2 +-
 test/ExecCtrl/EPTF_ExecCtrl_Test.tpd                      | 2 +-
 test/ExecCtrl/EPTF_ExecCtrl_Test_Definitions.ttcn         | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_Test_ExternalFunctions.cc     | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_Test_Functions.ttcn           | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.cfg              | 4 ++--
 test/ExecCtrl/EPTF_ExecCtrl_Test_HtmlGui.tpd              | 2 +-
 test/ExecCtrl/EPTF_ExecCtrl_Test_Testcases.ttcn           | 4 ++--
 test/ExecCtrl/PerfTest/storePerformanceResults.sh         | 4 ++--
 test/ExecCtrl/gui.xml                                     | 2 +-
 test/ExecCtrl/makePatch.sh                                | 4 ++--
 test/ExecCtrl/oldgui.xml                                  | 2 +-
 test/ExecCtrl/runTop.sh                                   | 4 ++--
 test/ExecCtrl/smokeTests.txt                              | 4 ++--
 test/FreeBusyQueue/EPTF_FBQ_Test.cfg                      | 4 ++--
 test/FreeBusyQueue/EPTF_FBQ_Test.prj                      | 2 +-
 test/FreeBusyQueue/EPTF_FBQ_Test.tpd                      | 2 +-
 test/FreeBusyQueue/EPTF_FBQ_Test.ttcn                     | 4 ++--
 test/FreeBusyQueue/smokeTests.txt                         | 4 ++--
 test/GUIViewer/EPTF_GUIViewer_Test.grp                    | 4 ++--
 test/GUIViewer/EPTF_GUIViewer_Test_Testcases.ttcn         | 4 ++--
 test/GUIViewer/GUIViewer_Test.cfg                         | 4 ++--
 ...Viewer_Test_without_simulation_getData_nonblocking.prj | 4 ++--
 test/HashMap/EPTF_HashMap_Test.prj                        | 2 +-
 test/HashMap/EPTF_HashMap_Test.tpd                        | 2 +-
 test/HashMap/HashMap.cfg                                  | 4 ++--
 test/HashMap/HashMap_global_test.ttcn                     | 4 ++--
 test/HashMap/HashMap_int2int_test.ttcn                    | 4 ++--
 test/HashMap/HashMap_oct2int_test.ttcn                    | 4 ++--
 test/HashMap/HashMap_perfTest.ttcn                        | 4 ++--
 test/HashMap/HashMap_str2int_test.ttcn                    | 4 ++--
 test/HashMap/HashMap_stresstest.ttcn                      | 4 ++--
 test/HashMap/HashMap_test.grp                             | 4 ++--
 test/HashMap/smokeTests.txt                               | 4 ++--
 test/HostAdmin/EPTF_HostAdmin_Test.cfg                    | 4 ++--
 test/HostAdmin/EPTF_HostAdmin_Test.prj                    | 2 +-
 test/HostAdmin/EPTF_HostAdmin_Test.tpd                    | 2 +-
 test/HostAdmin/EPTF_HostAdmin_Test_Definitions.ttcn       | 4 ++--
 test/HostAdmin/EPTF_HostAdmin_Test_ExternalFunctions.cc   | 4 ++--
 test/HostAdmin/EPTF_HostAdmin_Test_Functions.ttcn         | 4 ++--
 test/HostAdmin/EPTF_HostAdmin_Test_Testcases.ttcn         | 4 ++--
 test/HostAdmin/gui.xml                                    | 2 +-
 test/HostAdmin/gui_genapp_hostadmin_tabpanel.xml          | 2 +-
 ...ui_genapp_hostadmin_tabpanel_withOverloadDetection.xml | 2 +-
 test/HostAdmin/hostadmin_gui.xml                          | 2 +-
 test/HostAdmin/makefile_patch.sh                          | 4 ++--
 test/HostAdmin/smokeTests.txt                             | 4 ++--
 test/ILog/EPTF_ILogString_Test.ttcn                       | 4 ++--
 test/ILog/EPTF_ILog_Test.cfg                              | 4 ++--
 test/ILog/EPTF_ILog_Test.grp                              | 4 ++--
 test/ILog/EPTF_ILog_Test.prj                              | 2 +-
 test/ILog/EPTF_ILog_Test.tpd                              | 2 +-
 test/ILog/EPTF_ILog_Test.ttcn                             | 4 ++--
 test/LGenBase/EPTF_CLL_LGenBase_PerfTest.prj              | 2 +-
 test/LGenBase/EPTF_CLL_LGenBase_PerfTest.tpd              | 2 +-
 test/LGenBase/EPTF_CLL_LGenBase_Test.grp                  | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test.cfg                      | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test.grp                      | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test.prj                      | 2 +-
 test/LGenBase/EPTF_LGenBase_Test.tpd                      | 2 +-
 test/LGenBase/EPTF_LGenBase_Test_CustomGUI.cfg            | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_CustomGUI.prj            | 2 +-
 test/LGenBase/EPTF_LGenBase_Test_CustomGUI.tpd            | 2 +-
 test/LGenBase/EPTF_LGenBase_Test_CustomGUI.ttcn           | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_CustomGUI.xml            | 2 +-
 test/LGenBase/EPTF_LGenBase_Test_Definitions.ttcn         | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_Functions.ttcn           | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_PhaseTestcases.ttcn      | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_Templates.ttcn           | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_Testcases.cfg            | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_Testcases.ttcn           | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR10.ttcn        | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR11.ttcn        | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR12.ttcn        | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR13.ttcn        | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR14.ttcn        | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR18.ttcn        | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR3.ttcn         | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR4.ttcn         | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR7.ttcn         | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR8.ttcn         | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_TestcasesR9.ttcn         | 4 ++--
 test/LGenBase/EPTF_LGenBase_Test_Testcases_Latest.ttcn    | 4 ++--
 test/LGenBase/LGenBaseStatsUI.cfg                         | 4 ++--
 test/LGenBase/LGenBaseStatsUI_Test.ttcn                   | 4 ++--
 .../EPTF_LGenBasePerformTest_MTASDefinitions.ttcn         | 4 ++--
 .../EPTF_LGenBasePerformTest_MTASFunctions.ttcnpp         | 4 ++--
 .../EPTF_LGenBasePerformTest_MTCDefinitions.ttcnpp        | 4 ++--
 .../EPTF_LGenBasePerformTest_MTCFunctions.ttcnpp          | 4 ++--
 .../PerformanceTests/EPTF_LGenBase_PerformanceTest.grp    | 4 ++--
 .../EPTF_LGenBase_PerformanceTests.ttcnpp                 | 4 ++--
 .../FSMTest/EPTF_LGenBase_PerfTest_FSM_Definitions.ttcn   | 4 ++--
 .../FSMTest/EPTF_LGenBase_PerfTest_FSM_Functions.ttcn     | 4 ++--
 .../FSMTest/EPTF_LGenBase_PerfTest_FSM_TestCases.ttcn     | 4 ++--
 .../FSMTest/EPTF_LGenBase_PerformanceTest_FSM.grp         | 4 ++--
 .../LGenBase/PerformanceTests/LGenBaseRegressionTests.cfg | 4 ++--
 .../PerformanceTests/LGenBase_PerformanceTest.cfg         | 4 ++--
 ...PTF_LGenBasePerformTest_CompareEventDispatchTypes.ttcn | 4 ++--
 .../EPTF_LGenBasePerformTest_LoadLGenDefinitions.ttcn     | 4 ++--
 .../EPTF_LGenBasePerformTest_LoadLGenFunctions.ttcnpp     | 4 ++--
 .../EPTF_LGenBasePerformTest_LoadMTCDefinitions.ttcnpp    | 4 ++--
 .../LoadTest/EPTF_LGenBasePerformTest_LoadMessages.ttcnpp | 4 ++--
 .../LoadTest/EPTF_LGenBasePerformTest_LoadTestCPS.ttcnpp  | 4 ++--
 .../EPTF_LGenBasePerformTest_LoadTestResources.ttcnpp     | 4 ++--
 .../EPTF_LGenBasePerformTest_MemLoadgenDefinitions.ttcnpp | 4 ++--
 .../EPTF_LGenBasePerformTest_MemLoadgenFunctions.ttcnpp   | 4 ++--
 .../EPTF_LGenBasePerformTest_MemMTCDefinitions.ttcnpp     | 4 ++--
 .../EPTF_LGenBasePerformTest_MemMTCFunctions.ttcnpp       | 4 ++--
 .../MemUsage/EPTF_LGenBasePerformTest_MemMessages.ttcnpp  | 4 ++--
 .../MemUsage/EPTF_LGenBasePerformTest_MemTestCases.ttcnpp | 4 ++--
 test/LGenBase/PerformanceTests/PerfTestPatchR3.sh         | 4 ++--
 test/LGenBase/PerformanceTests/storePerformanceResults.sh | 4 ++--
 test/LGenBase/makefile_patch.sh                           | 4 ++--
 test/LGenBase/paramDemoAppLib_Definitions.ttcn            | 4 ++--
 test/LGenBase/paramDemoAppLib_Functions.ttcn              | 4 ++--
 test/LGenBase/smokeTests.txt                              | 4 ++--
 test/LoadRegulator/EPTF_CLL_LoadRegulator_XML.xml         | 2 +-
 test/LoadRegulator/EPTF_LoadRegulator_Test.cfg            | 4 ++--
 test/LoadRegulator/EPTF_LoadRegulator_Test.prj            | 2 +-
 test/LoadRegulator/EPTF_LoadRegulator_Test.tpd            | 2 +-
 test/LoadRegulator/EPTF_LoadRegulator_Test.ttcn           | 4 ++--
 test/LoadRegulator/smokeTests.txt                         | 4 ++--
 test/Logging/EPTF_LoggingDSGUI_Test.prj                   | 2 +-
 test/Logging/EPTF_LoggingDSGUI_Test.tpd                   | 2 +-
 test/Logging/EPTF_LoggingDSGUI_TestCases.ttcn             | 4 ++--
 test/Logging/EPTF_LoggingDSGUI_test.cfg                   | 4 ++--
 test/Logging/EPTF_LoggingDS_Test.prj                      | 2 +-
 test/Logging/EPTF_LoggingDS_Test.tpd                      | 2 +-
 test/Logging/EPTF_LoggingDS_TestCases.ttcn                | 4 ++--
 test/Logging/EPTF_LoggingDS_test.cfg                      | 4 ++--
 test/Logging/EPTF_LoggingUI_Test.tpd                      | 2 +-
 test/Logging/EPTF_LoggingUI_Test_disabled.prj             | 2 +-
 test/Logging/EPTF_LoggingUI_test.cfg                      | 4 ++--
 test/Logging/EPTF_LoggingUI_test.ttcn                     | 4 ++--
 test/Logging/EPTF_Logging_Test.prj                        | 2 +-
 test/Logging/EPTF_Logging_Test.tpd                        | 2 +-
 test/Logging/EPTF_Logging_test.cfg                        | 4 ++--
 test/Logging/EPTF_Logging_test.ttcn                       | 4 ++--
 test/Logging/TCCUsefulFunctions.grp                       | 4 ++--
 test/Logging/TELNETasp.grp                                | 4 ++--
 test/Logging/gui.xml                                      | 2 +-
 test/Logging/smokeTests.txt                               | 4 ++--
 test/Logging/smokeTestsUI.txt                             | 4 ++--
 test/NQueue/EPTF_NQueue_Test.cfg                          | 4 ++--
 test/NQueue/EPTF_NQueue_Test.prj                          | 2 +-
 test/NQueue/EPTF_NQueue_Test.tpd                          | 2 +-
 test/NQueue/EPTF_NQueue_Test.ttcn                         | 4 ++--
 test/NQueue/smokeTests.txt                                | 4 ++--
 test/NameService/EPTF_NameService_Test.cfg                | 4 ++--
 test/NameService/EPTF_NameService_Test.prj                | 2 +-
 test/NameService/EPTF_NameService_Test.tpd                | 2 +-
 test/NameService/EPTF_NameService_Test_Definitions.ttcn   | 4 ++--
 test/NameService/EPTF_NameService_Test_Functions.ttcn     | 4 ++--
 test/NameService/EPTF_NameService_Test_Testcases.ttcn     | 4 ++--
 test/NameService/smokeTests.txt                           | 4 ++--
 test/PTCDeployment/EPTF_PTCDeployment_Test.cfg            | 4 ++--
 test/PTCDeployment/EPTF_PTCDeployment_Test.prj            | 4 ++--
 test/PTCDeployment/EPTF_PTCDeployment_Test.tpd            | 2 +-
 test/PTCDeployment/EPTF_PTCDeployment_Test_Testcases.ttcn | 4 ++--
 test/PTCDeployment/smokeTests.txt                         | 4 ++--
 test/RandomNArray/EPTF_RNA.cfg                            | 4 ++--
 test/RandomNArray/EPTF_RNA_Test.prj                       | 2 +-
 test/RandomNArray/EPTF_RNA_Test.tpd                       | 2 +-
 test/RandomNArray/EPTF_RNA_Test.ttcn                      | 4 ++--
 test/RandomNArray/smokeTests.txt                          | 4 ++--
 test/RedBlackTree/EPTF_RBT_Test.cfg                       | 4 ++--
 test/RedBlackTree/EPTF_RBT_Test.prj                       | 2 +-
 test/RedBlackTree/EPTF_RBT_Test.tpd                       | 2 +-
 test/RedBlackTree/EPTF_RBT_Test.ttcn                      | 4 ++--
 test/RedBlackTree/smokeTests.txt                          | 4 ++--
 test/Rendezvous/EPTF_Rendezvous_Test.prj                  | 2 +-
 test/Rendezvous/EPTF_Rendezvous_Test.tpd                  | 2 +-
 test/Rendezvous/EPTF_Rendezvous_test.ttcn                 | 4 ++--
 test/Rendezvous/Rendezvous.cfg                            | 4 ++--
 test/Rendezvous/smokeTests.txt                            | 4 ++--
 test/RingBuffer/EPTF_RingBuffer_Test.cfg                  | 4 ++--
 test/RingBuffer/EPTF_RingBuffer_Test.tpd                  | 2 +-
 test/RingBuffer/GenericRingBuffer_TestCases.ttcnpp        | 4 ++--
 test/RingBuffer/IntegerRingBuffer_TestCases.ttcn          | 4 ++--
 test/RingBuffer/RingBuffer_Test.prj                       | 2 +-
 test/RingBuffer/smokeTests.txt                            | 4 ++--
 test/SMacro/EPTF_SMacro_PerfTest.cfg                      | 4 ++--
 test/SMacro/EPTF_SMacro_PerfTest.prj                      | 2 +-
 test/SMacro/EPTF_SMacro_PerfTest.tpd                      | 2 +-
 test/SMacro/EPTF_SMacro_PerfTest_Definitions.ttcn         | 4 ++--
 test/SMacro/EPTF_SMacro_PerfTest_Functions.ttcn           | 4 ++--
 test/SMacro/EPTF_SMacro_PerfTest_Testcases.ttcn           | 4 ++--
 test/SMacro/EPTF_SMacro_Test.cfg                          | 4 ++--
 test/SMacro/EPTF_SMacro_Test.prj                          | 2 +-
 test/SMacro/EPTF_SMacro_Test.tpd                          | 2 +-
 test/SMacro/EPTF_SMacro_Test_Definitions.ttcn             | 4 ++--
 test/SMacro/EPTF_SMacro_Test_Functions.ttcn               | 4 ++--
 test/SMacro/EPTF_SMacro_Test_Testcases.ttcn               | 4 ++--
 test/SMacro/makefile_patch.sh                             | 4 ++--
 test/SMacro/storePerformanceResults.sh                    | 4 ++--
 test/Scheduler/EPTF_Scheduler_PerfTest.cfg                | 4 ++--
 test/Scheduler/EPTF_Scheduler_PerfTest.prj                | 2 +-
 test/Scheduler/EPTF_Scheduler_PerfTest.tpd                | 2 +-
 test/Scheduler/EPTF_Scheduler_PerfTest_Definitions.ttcn   | 4 ++--
 test/Scheduler/EPTF_Scheduler_PerfTest_Functions.ttcn     | 4 ++--
 test/Scheduler/EPTF_Scheduler_PerfTest_Testcases.ttcn     | 4 ++--
 test/Scheduler/EPTF_Scheduler_Test.cfg                    | 4 ++--
 test/Scheduler/EPTF_Scheduler_Test.prj                    | 2 +-
 test/Scheduler/EPTF_Scheduler_Test.tpd                    | 2 +-
 test/Scheduler/EPTF_Scheduler_Test_Definitions.ttcn       | 4 ++--
 test/Scheduler/EPTF_Scheduler_Test_Functions.ttcn         | 4 ++--
 test/Scheduler/EPTF_Scheduler_Test_Testcases.ttcn         | 4 ++--
 test/Scheduler/makefile_patch.sh                          | 4 ++--
 test/Scheduler/smokeTests.txt                             | 4 ++--
 test/Scheduler/storePerformanceResults.sh                 | 4 ++--
 test/Semaphore/EPTF_Semaphore_Test.cfg                    | 4 ++--
 test/Semaphore/EPTF_Semaphore_Test.prj                    | 2 +-
 test/Semaphore/EPTF_Semaphore_Test.tpd                    | 2 +-
 test/Semaphore/EPTF_Semaphore_Test_Definitions.ttcn       | 4 ++--
 test/Semaphore/EPTF_Semaphore_Test_Functions.ttcn         | 4 ++--
 test/Semaphore/EPTF_Semaphore_Test_Testcases.ttcn         | 4 ++--
 test/Semaphore/smokeTests.txt                             | 4 ++--
 test/StatCapture/EPTF_CLL_StatCapture_Test.tpd            | 2 +-
 test/StatCapture/EPTF_StatCapture_Test.cfg                | 4 ++--
 test/StatCapture/EPTF_StatCapture_Test.prj                | 2 +-
 test/StatCapture/EPTF_StatCapture_Test.tpd                | 2 +-
 test/StatCapture/EPTF_StatCapture_Test_Definitions.ttcn   | 4 ++--
 test/StatCapture/EPTF_StatCapture_Test_Functions.ttcn     | 4 ++--
 test/StatCapture/EPTF_StatCapture_Test_Testcases.ttcn     | 4 ++--
 test/StatCapture/smokeTests.txt                           | 4 ++--
 test/StatHandler/EPTF_StatHandler_Test.cfg                | 4 ++--
 test/StatHandler/EPTF_StatHandler_Test.prj                | 2 +-
 test/StatHandler/EPTF_StatHandler_Test.tpd                | 2 +-
 test/StatHandler/EPTF_StatHandler_Test_Definitions.ttcn   | 4 ++--
 test/StatHandler/EPTF_StatHandler_Test_Functions.ttcn     | 4 ++--
 test/StatHandler/EPTF_StatHandler_Test_Testcases.ttcn     | 4 ++--
 test/StatHandler/smokeTests.txt                           | 4 ++--
 test/StatHandler/stathandler_gui.xml                      | 2 +-
 test/StatManager/EPTF_StatManager_Test.cfg                | 4 ++--
 test/StatManager/EPTF_StatManager_Test.prj                | 2 +-
 test/StatManager/EPTF_StatManager_Test.tpd                | 2 +-
 test/StatManager/EPTF_StatManager_Test_Definitions.ttcn   | 4 ++--
 test/StatManager/EPTF_StatManager_Test_Functions.ttcn     | 4 ++--
 test/StatManager/EPTF_StatManager_Test_Testcases.ttcn     | 4 ++--
 test/StatMeasure/EPTF_StatMeasure_Test.cfg                | 4 ++--
 test/StatMeasure/EPTF_StatMeasure_Test.prj                | 2 +-
 test/StatMeasure/EPTF_StatMeasure_Test.tpd                | 2 +-
 test/StatMeasure/EPTF_StatMeasure_Test_Definitions.ttcn   | 4 ++--
 test/StatMeasure/EPTF_StatMeasure_Test_Functions.ttcn     | 4 ++--
 test/StatMeasure/EPTF_StatMeasure_Test_Testcases.ttcn     | 4 ++--
 test/StatMeasure/smokeTests.txt                           | 4 ++--
 test/StatReplay/DefaultFile_2008-12-16_11.10.04.txt       | 4 ++--
 test/StatReplay/EPTF_StatReplay_Test.cfg                  | 4 ++--
 test/StatReplay/EPTF_StatReplay_Test.prj                  | 2 +-
 test/StatReplay/EPTF_StatReplay_Test.tpd                  | 2 +-
 test/StatReplay/testlog.txt                               | 4 ++--
 test/TimeProfileEditor/EPTF_TPE_Test.cfg                  | 4 ++--
 test/TimeProfileEditor/EPTF_TPE_Test.prj                  | 2 +-
 test/TimeProfileEditor/EPTF_TPE_Test.tpd                  | 2 +-
 test/TimeProfileEditor/EPTF_TPE_Test_Definitions.ttcn     | 4 ++--
 test/TimeProfileEditor/EPTF_TPE_Test_Functions.ttcn       | 4 ++--
 test/TimeProfileEditor/EPTF_TPE_Test_Templates.ttcn       | 4 ++--
 test/TimeProfileEditor/EPTF_TPE_Test_Testcases.ttcn       | 4 ++--
 test/TimeProfileEditor/edited_time_profiles.cfg           | 4 ++--
 test/TimeProfileEditor/smokeTests.txt                     | 4 ++--
 test/Transport/EPTF_Transport_IPsecHandler_Test.cfg       | 4 ++--
 test/Transport/EPTF_Transport_IPsecHandler_Test.prj       | 2 +-
 .../EPTF_Transport_IPsecHandler_Test_Definitions.ttcn     | 4 ++--
 .../EPTF_Transport_IPsecHandler_Test_Functions.ttcn       | 4 ++--
 .../EPTF_Transport_IPsecHandler_Test_TestCases.ttcn       | 4 ++--
 test/Transport/EPTF_Transport_NonBlocking_Test.cfg        | 4 ++--
 test/Transport/EPTF_Transport_NonBlocking_Test.prj        | 2 +-
 test/Transport/EPTF_Transport_NonBlocking_Test.tpd        | 2 +-
 test/Transport/EPTF_Transport_PerfTest.cfg                | 4 ++--
 test/Transport/EPTF_Transport_PerfTest.prj                | 2 +-
 .../EPTF_Transport_PerfTest_ExternalFunctions.cc          | 4 ++--
 test/Transport/EPTF_Transport_PerfTest_Testcases.ttcn     | 4 ++--
 test/Transport/EPTF_Transport_Test.cfg                    | 4 ++--
 test/Transport/EPTF_Transport_Test.prj                    | 2 +-
 test/Transport/EPTF_Transport_Test.tpd                    | 2 +-
 test/Transport/EPTF_Transport_Test_Definitions.ttcn       | 4 ++--
 test/Transport/EPTF_Transport_Test_Functions.ttcn         | 4 ++--
 test/Transport/EPTF_Transport_Test_Testcases.ttcn         | 4 ++--
 test/Transport/EPTF_Transport_Test_perfTestcases.ttcn     | 4 ++--
 test/Transport/makefile_patch.sh                          | 4 ++--
 test/Transport/smokeTests.txt                             | 4 ++--
 test/Transport/storePerformanceResults.sh                 | 4 ++--
 test/UIHandler/BrowserGUI/TitanSimAbout.html              | 2 +-
 test/UIHandler/BrowserGUI/custom1.css                     | 4 ++--
 test/UIHandler/BrowserGUI/custom2.css                     | 4 ++--
 test/UIHandler/EPTF_UIHandler_ExternalValue_Test.cfg      | 4 ++--
 test/UIHandler/EPTF_UIHandler_ExternalValue_Test.tpd      | 2 +-
 .../UIHandler/EPTF_UIHandler_ExternalValue_Testcases.ttcn | 4 ++--
 test/UIHandler/EPTF_UIHandler_GUIVariables_Test.cfg       | 4 ++--
 test/UIHandler/EPTF_UIHandler_GUIVariables_Test.tpd       | 2 +-
 test/UIHandler/EPTF_UIHandler_GUIVariables_Testcases.ttcn | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test.cfg                    | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test.grp                    | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test.prj                    | 2 +-
 test/UIHandler/EPTF_UIHandler_Test.tpd                    | 2 +-
 test/UIHandler/EPTF_UIHandler_Test2.cfg                   | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test2.prj                   | 2 +-
 test/UIHandler/EPTF_UIHandler_Test2.tpd                   | 2 +-
 test/UIHandler/EPTF_UIHandler_TestEmptyLayout.cfg         | 4 ++--
 test/UIHandler/EPTF_UIHandler_TestEmptyLayout.prj         | 2 +-
 test/UIHandler/EPTF_UIHandler_TestEmptyLayout.tpd         | 2 +-
 test/UIHandler/EPTF_UIHandler_TestReconnect.tpd           | 2 +-
 test/UIHandler/EPTF_UIHandler_TestReconnect.ttcn          | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_ASN1_Definitions.ttcn  | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_Definitions.ttcn       | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_ExternalFunctions.cc   | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_Functions.ttcn         | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_IteratorTestcases.ttcn | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_Testcases.ttcn         | 4 ++--
 test/UIHandler/EPTF_UIHandler_Test_XSD_Definitions.ttcn   | 4 ++--
 test/UIHandler/EPTF_UIHandler_reconnect.cfg               | 4 ++--
 test/UIHandler/Makefile_script                            | 4 ++--
 test/UIHandler/runTop.sh                                  | 4 ++--
 test/UIHandler/smokeTests.txt                             | 4 ++--
 test/Variable/EPTF_Variable_PerfTest.cfg                  | 4 ++--
 test/Variable/EPTF_Variable_PerfTest.grp                  | 4 ++--
 test/Variable/EPTF_Variable_PerfTest.prj                  | 2 +-
 test/Variable/EPTF_Variable_PerfTest_Definitions.ttcn     | 4 ++--
 test/Variable/EPTF_Variable_PerfTest_Functions.ttcn       | 4 ++--
 test/Variable/EPTF_Variable_PerfTest_Testcases.ttcn       | 4 ++--
 test/Variable/EPTF_Variable_Test.cfg                      | 4 ++--
 test/Variable/EPTF_Variable_Test.grp                      | 4 ++--
 test/Variable/EPTF_Variable_Test.prj                      | 2 +-
 test/Variable/EPTF_Variable_Test.tpd                      | 2 +-
 test/Variable/EPTF_Variable_Test_Definitions.ttcn         | 4 ++--
 test/Variable/EPTF_Variable_Test_Functions.ttcn           | 4 ++--
 test/Variable/EPTF_Variable_Test_Testcases.ttcn           | 4 ++--
 test/Variable/README.txt                                  | 4 ++--
 test/Variable/makefile_patch.sh                           | 4 ++--
 test/Variable/smokeTests.txt                              | 4 ++--
 test/Variable/storePerformanceResults.sh                  | 4 ++--
 test/WebGUI/EPTF_WebGUI_Test.cfg                          | 4 ++--
 test/WebGUI/EPTF_WebGUI_Test.grp                          | 4 ++--
 test/WebGUI/EPTF_WebGUI_Test.prj                          | 2 +-
 test/WebGUI/EPTF_WebGUI_Test.tpd                          | 2 +-
 test/WebGUI/EPTF_WebGUI_Test_Definitions.ttcn             | 4 ++--
 test/WebGUI/EPTF_WebGUI_Test_Functions.ttcn               | 4 ++--
 test/WebGUI/EPTF_WebGUI_Test_Testcases.ttcn               | 4 ++--
 test/WebGUI/MockTest/AjvSelfTest.js                       | 4 ++--
 test/WebGUI/MockTest/Main.js                              | 4 ++--
 test/WebGUI/MockTest/TestConfigModelFiller.js             | 4 ++--
 test/WebGUI/MockedServer/DSHelp.js                        | 4 ++--
 test/WebGUI/MockedServer/DataGenerator.js                 | 4 ++--
 test/WebGUI/MockedServer/DsRestAPIComm_Mock.js            | 4 ++--
 test/WebGUI/MockedServer/FileHandler.js                   | 4 ++--
 test/WebGUI/MockedServer/Model.js                         | 4 ++--
 test/WebGUI/Selenium/BaseTestCase.py                      | 4 ++--
 test/WebGUI/Selenium/Framework_CommonFunctions.py         | 4 ++--
 test/WebGUI/Selenium/Framework_LoadingWebApps.py          | 4 ++--
 test/WebGUI/Selenium/GuiEditor_CommonFunctions.py         | 4 ++--
 test/WebGUI/Selenium/GuiEditor_ConnectionTests.py         | 4 ++--
 test/WebGUI/Selenium/GuiEditor_EditorTests.py             | 4 ++--
 test/WebGUI/Selenium/GuiEditor_SetupHandlingTests.py      | 4 ++--
 test/WebGUI/Selenium/RequestConsole_Tests.py              | 4 ++--
 test/WebGUI/Selenium/runTests.py                          | 4 ++--
 test/WebGUI/Selenium/runTestsWithXvfb.sh                  | 4 ++--
 test/WebGUI/createOfflineWebGUI.sh                        | 4 ++--
 test/tpd_cfg_connections.txt                              | 4 ++--
 tools/CallStackAnalizer/CallStackAnalizer.awk             | 4 ++--
 tools/CheckCopyConstructor/CheckCopyConstuctor.sh         | 4 ++--
 tools/CheckCopyConstructor/CopyConstCheck.awk             | 4 ++--
 tools/CheckCopyConstructor/readme.txt                     | 4 ++--
 tools/DependencyGraphCreation/README.txt                  | 4 ++--
 tools/DependencyGraphCreation/extend_graph.sh             | 4 ++--
 tools/DependencyGraphCreation/feature_graph.sh            | 4 ++--
 tools/DependencyGraphCreation/make-extend-graph.sh        | 4 ++--
 tools/DependencyGraphCreation/make-graph-images.sh        | 4 ++--
 tools/DependencyGraphCreation/make-graphs.sh              | 4 ++--
 tools/DependencyGraphCreation/make-import-graphs.sh       | 4 ++--
 tools/HelpForDataSources/EPTF_DSHelp.cfg                  | 4 ++--
 tools/HelpForDataSources/EPTF_DSHelp.grp                  | 4 ++--
 tools/HelpForDataSources/EPTF_DSHelp.prj                  | 2 +-
 tools/HelpForDataSources/EPTF_DSHelp.tpd                  | 2 +-
 tools/HelpForDataSources/EPTF_DSHelp_Definitions.ttcn     | 4 ++--
 tools/HelpForDataSources/EPTF_DSHelp_Functions.ttcn       | 4 ++--
 tools/HelpForDataSources/EPTF_DSHelp_Testcases.ttcn       | 4 ++--
 tools/HelpForDataSources/GUI/Application/Main.css         | 4 ++--
 tools/HelpForDataSources/GUI/Application/Main.html        | 2 +-
 tools/HelpForDataSources/GUI/Application/View.js          | 4 ++--
 tools/HelpForDataSources/GUI/Application/ViewModel.js     | 4 ++--
 tools/NaturaldocsGeneration/Languages.txt                 | 4 ++--
 tools/NaturaldocsGeneration/Menu.txt                      | 4 ++--
 tools/NaturaldocsGeneration/TITANSim.html                 | 2 +-
 tools/NaturaldocsGeneration/Topics.txt                    | 4 ++--
 tools/NaturaldocsGeneration/closegroups.sh                | 4 ++--
 tools/NaturaldocsGeneration/generate.sh                   | 4 ++--
 tools/NaturaldocsGeneration/generateAPIDoc.sh             | 4 ++--
 tools/NaturaldocsGeneration/index.html                    | 2 +-
 tools/NaturaldocsGeneration/load.css                      | 4 ++--
 tools/NaturaldocsGeneration/repairunnaturalhtml.pl        | 4 ++--
 tools/NaturaldocsGeneration/update2.sh                    | 4 ++--
 tools/PoolMgmt/EPTF_CLL_PoolMgmt_Definitions.ttcnin       | 4 ++--
 tools/PoolMgmt/EPTF_CLL_PoolMgmt_Functions.ttcnin         | 4 ++--
 tools/PoolMgmt/EPTF_PoolManagement.grp                    | 4 ++--
 tools/PoolMgmt/createPool.sh                              | 4 ++--
 tools/PoolMgmt/generatedCode_dummy.ttcn                   | 4 ++--
 tools/SysStatLogger/sysstatLogger.sh                      | 4 ++--
 tools/TTCN3Coverage/CodeLineCount.awk                     | 4 ++--
 tools/TTCN3Coverage/EPTF_CLL_TTCN3Coverage.ttcn           | 4 ++--
 tools/TTCN3Coverage/ExtractFunctions.awk                  | 4 ++--
 tools/TTCN3Coverage/GetSourceFileName.awk                 | 4 ++--
 tools/TTCN3Coverage/GetUnusedFns.awk                      | 4 ++--
 tools/TTCN3Coverage/MergeResults.awk                      | 4 ++--
 tools/TTCN3Coverage/ShowCoverage.pats                     | 4 ++--
 tools/TTCN3Coverage/TTCN3Coverage.awk                     | 4 ++--
 tools/TTCN3Coverage/TTCN3Coverage.grp                     | 4 ++--
 tools/TTCN3Coverage/TTCN3Coverage.tpd                     | 2 +-
 tools/TTCN3Coverage/compiler                              | 4 ++--
 tools/TTCN3Coverage/cov2ttcn3                             | 4 ++--
 tools/TTCN3Coverage/coverage2nedit.awk                    | 4 ++--
 tools/TTCN3Coverage/make                                  | 4 ++--
 tools/TTCN3Coverage/ttcn3cov                              | 4 ++--
 tools/TTCN3Coverage/ttcn3cov.cc                           | 4 ++--
 tools/TTCN3Coverage/ttcn3cov.hh                           | 4 ++--
 tools/TTCN3Coverage/ttcn3cov_gen                          | 4 ++--
 tools/TTCN3Coverage/ttcn3cov_unusedFns                    | 4 ++--
 tools/TTCN3Profiler/EPTF_CLL_TTCN3Profiler.ttcn           | 4 ++--
 tools/TTCN3Profiler/ShowProfiler.pats                     | 4 ++--
 tools/TTCN3Profiler/TTCN3Profiler.awk                     | 4 ++--
 tools/TTCN3Profiler/TTCN3Profiler.grp                     | 4 ++--
 tools/TTCN3Profiler/TTCN3Profiler.tpd                     | 2 +-
 tools/TTCN3Profiler/prof2ttcn3                            | 4 ++--
 tools/TTCN3Profiler/profiler2nedit.awk                    | 4 ++--
 tools/TTCN3Profiler/ttcn3prof                             | 4 ++--
 tools/TTCN3Profiler/ttcn3prof.cc                          | 4 ++--
 tools/TTCN3Profiler/ttcn3prof.hh                          | 4 ++--
 tools/TTCN3Profiler/ttcn3prof_GetUnusedFns.awk            | 4 ++--
 tools/TTCN3Profiler/ttcn3prof_MergeResults.awk            | 4 ++--
 tools/TTCN3Profiler/ttcn3prof_gen                         | 4 ++--
 tools/TTCN3Profiler/ttcn3prof_unusedFns                   | 4 ++--
 tools/TestResultGen/GeneratedFiles.grp                    | 4 ++--
 tools/TestResultGen/TestResultGen.grp                     | 4 ++--
 tools/TestResultGen/TestResultGen.tpd                     | 2 +-
 tools/TestResultGen/TestResultGen.ttcn                    | 4 ++--
 tools/TestResultGen/TestResultGen_Dep.grp                 | 4 ++--
 tools/TestResultGen/TestResultGen_ExternalFunctions.cc    | 4 ++--
 tools/TestResultGen/UsefulTtcn3Types.ttcn                 | 4 ++--
 tools/TestResultGen/XSD.ttcn                              | 4 ++--
 tools/TestResultGen/demo/TestResultGen_Demo.grp           | 4 ++--
 tools/TestResultGen/demo/TestResultGen_Demo.prj           | 4 ++--
 tools/TestResultGen/demo/TestResultGen_Demo.ttcn          | 4 ++--
 tools/TestResultGen/demo/testresults_example.xml          | 2 +-
 tools/TestResultGen/run_xsd2ttcn.sh                       | 4 ++--
 tools/TestResultGen/showtest_result.html                  | 2 +-
 tools/TestResultGen/showtest_result.js                    | 4 ++--
 tools/TestResultGen/testresults.css                       | 4 ++--
 tools/TestResultGen/testresults.xsd                       | 2 +-
 tools/TestResultGen/testresults.xsl                       | 2 +-
 tools/TestResultGen/testresultsXML2HTML.awk               | 4 ++--
 tools/TestResultGen/testresultsXML2HTML.sh                | 4 ++--
 .../TestResultGen/ttcn_ericsson_se_TitanSim_Perftest.ttcn | 4 ++--
 tools/Tpd2prj/tpd2prj.py                                  | 4 ++--
 1147 files changed, 2065 insertions(+), 2065 deletions(-)

diff --git a/demo/Base/EPTF_Base_all.cfg b/demo/Base/EPTF_Base_all.cfg
index bfd6efb1..6d408830 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 c241958c..7afb5ad4 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 bad02e88..e0bad849 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 bfd6efb1..6d408830 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 9a8af193..a2bc53e4 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 7fdd51fb..b522bccd 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 e6e57710..1c5a1fc9 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 b9b25e72..d69856e2 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 cfcdb5af..be7bcb1b 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 de16880b..b8b82039 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 75a2ce19..5997e127 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 284c9cd4..096abb32 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 40e90031..fa51c62a 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 233f4171..56ed8e7b 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 b20d52e6..3590fcd6 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 6130d2ac..dc53eb9c 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 3c9f5b6e..4785b4fd 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 64dc6c54..eb9177b3 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 57e3fea9..2895afc0 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 676d9275..15b45ada 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 229ec595..74e37389 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 31130dfb..833f6a84 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 87d89991..da252e69 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 9374e87b..e460fba0 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 f9dc1e96..9785b5bc 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 af239be1..b32bb569 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 82cd9277..a27b5e00 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 dbe4f340..f75b9516 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 207fa5cc..de60e710 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 a10dc01f..c84085ad 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 275740ed..25736117 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 b3c7bcc5..b261ff96 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 9f90de58..665a57b3 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 9491b7b2..e1acad08 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 5e018f4b..7c113506 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 aa6a1d5b..ef42ef8d 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 efd1bf07..0db28537 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 53160d19..18b510b6 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 24704f85..05cb5a68 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 01ca4743..1d07d6bb 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 aafdd48d..55aa0f85 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 85415077..a36d7235 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 2642b422..fe50391a 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 aa0bd32e..35e829db 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 b948ed0a..7115db71 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 fcc0688a..35f2c4ca 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 7176fb1f..a71f06f9 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 4140b428..a54192d1 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 e3d53cb1..d9502740 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 5e5b7616..f8489f53 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 3119af4d..865ead3f 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 02a4b3ee..a9992e48 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 ba96dd28..2f3ff479 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 307454f7..d0a1f630 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 d0023e8b..d3b15630 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 52f8f399..7cd3c6e4 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 3adb8e64..92efbeb1 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 467208aa..0cf3685d 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 61c91b45..7ddb5850 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 43ff67c7..c6a6c54c 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 1d79a78a..00806d14 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 dd318ab2..3a4c6910 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 4d52ac2a..975d7e17 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 a575dade..2332b950 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 1eab5ca1..bc99f684 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 10a97282..0653da33 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 7a08a8a7..a69cc76e 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 3cdbe5c6..73e673f9 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 94971df0..acc34d68 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 f9d7f959..b3e05147 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 656207fe..0bd7881b 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 23b39751..5800c134 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 d0a65dee..031d9e76 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 18173749..4bf35cd0 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 dd89a245..f7a8fa40 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 d45ff547..54f09530 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 3e83719f..6007aa91 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 2280bbb2..5bb4eda9 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 13be0656..eb765895 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 3342db22..0531965f 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 157a4993..a91a151c 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 15ada868..43f0c16f 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 f1e6a8b8..fa95f0ee 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 e3654493..75d0dc36 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 81f60c90..46c79cb8 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 167f2ba6..0c813018 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 ae458558..36059b2b 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 5ca1c6db..b67ac9e2 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 3573cb3f..8b6b5238 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 a83c13b2..85c1956e 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 74f81aeb..bf8f60d8 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 6232052d..d5b84682 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 0e63af1b..db19e8da 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 62f9926c..3052e24c 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 a1f3fd07..519e9970 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 25a5cefe..1843d206 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 5420017d..4a043ef2 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 55c98d49..4168fe30 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 e4dfb4d3..497eebf2 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 a6ced026..35d83d4f 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 8372597b..6e64a847 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 fe98f655..5a66d9d1 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 a81c502e..fe53e5e2 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 2e63e64a..8610b6d8 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 84eb50e5..c9a12092 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 14a51685..bc333c5d 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 a6eeb7bd..fbd35d1d 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 2d38f17c..1a31379f 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 1f5186be..02cb216f 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 e666f009..3c43f3a1 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 4b4fef69..fc9885a3 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 8be82626..aab25923 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 cf64c6db..09beb14a 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 3310b542..61ffd713 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 41f47141..5c1cd590 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 1786762e..470e78d5 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 098a194b..e8e90c9f 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 96984fd8..940909d4 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 1bc291e3..45aa3137 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 b6d7eb7c..1b2d53dc 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 868864a8..e60c33ab 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 58d42ea4..ae8f5deb 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 f6354500..56e0a8bc 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 954493bd..84a83807 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 d8b2fe75..19c560e1 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 a46d7026..b86148b2 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 2cd06879..950024ae 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 a9e90e2d..0d24f503 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 3b732cba..80d100af 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 5638f12a..e2257667 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 f723c0bc..e5ceb7aa 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 a2a3734e..2caf5da2 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 627a1b97..d9233104 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 21f6610e..afca1c88 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 a7c91e77..651a352a 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 3bd9e64d..7c6b2cec 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 8ff41fb8..12a9e9ed 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 3d922fd3..c7c98627 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 ba43c12a..587277e9 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 704ce5bb..262daffa 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 ec38a800..874563a1 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 4d02d5b4..52ac99a0 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 38d42af7..4fe231ff 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 fb02bde1..f4692cce 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 14ff4abe..84590eac 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 38f537db..08247d6f 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 dc0124c4..228f640d 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 ac67ca82..4f8d9839 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 aa8e62d9..603380a1 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 6d9cef23..5e24543e 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 6c70b55b..eb344f92 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 cc07c7b4..39370560 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 2accc559..cb23deb9 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 dfeb6d92..d4a8bff6 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 288602c0..41d0f9ac 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 66f03544..26a17ac7 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 0f2aab57..8127eca5 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 d53037cf..1a589c56 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 05968513..fe9daafa 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 941e1ae5..b6eb33e4 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 e4836c9b..6949d98b 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 5cec2c51..c5f35c28 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 f3e5ec83..004166fe 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 40fc6f5f..9de670ea 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 3657b697..fae8a2ba 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 cac45ac1..46e595b8 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 d62162fc..6a25be20 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 d22e5964..d1a7be3c 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 15b53744..877114b7 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 85c7ec4c..22f0d6bd 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 d7891a72..d33d6877 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 e652fc82..7433d5e2 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 e672b5dd..80672652 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 0e2fe29f..eb0c5a8a 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 8358172c..4788f0af 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 f089c40b..b3dbf34b 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 5b189d60..10c9f501 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 15a0f53d..a9c71d32 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 02ec1009..bff244dd 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 e63f1921..b0ebe5cd 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 d28cb14d..e406d070 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 12f76ae2..953abb6d 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 c4ae52db..102a92ba 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 652a444e..e08f5560 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 b50bb5f9..9c15705a 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 920b9498..b507b5b7 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 3ad0485e..a9a1eac0 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 b165ca3b..777343c4 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 bded1b90..5e5e8b49 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 66233c96..a6e7595d 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 b8b28c90..3d90aa35 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 0c2e50d4..2e9fc1bc 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 daa7c3d5..245f405b 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 7fbcbdcf..d3e14198 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 19f882d2..7b51576d 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 9bad8599..0856baad 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 dfaa872c..02b1bcaf 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 3435e7ef..c64d3d2b 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 07521576..319ff506 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 eaa0c666..0e4235c2 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 d46d0276..14214b09 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 d5f460c6..d392e262 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 154e0375..29f177bb 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 334430ed..eace0a8b 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 204b6dae..b9ba85c8 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 b4ee9562..0c370855 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 20591422..01431d1d 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 fa0490ad..0fe49f92 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 ab626743..e46e1a2c 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 92a71088..2a2073ec 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 30cc48c1..cbc0e278 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 0af6df57..eda324ff 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 34e07cfa..1459b8cb 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 36374bd2..e1a4fe7b 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 8d96d414..d6e851cf 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 09ec045a..290643ac 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 48d3708f..30bb6cb5 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 7ab1c57a..177b27ea 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 b1b5571d..9887625f 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 184de1bc..8dc7a717 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 577d2008..b3ef1219 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 8f530bc5..d2ee0297 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 003223d0..5115b45f 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 34581220..b0172863 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 70a8dd1c..46bd5c51 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 f99093a7..b150c186 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 8be48a80..d70384db 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 8bbe6370..66d23784 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 8dded974..59ed3b75 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 dc195530..a192b297 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 33866d97..e585da4f 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 afb7db5a..019c378c 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 4d3c95fe..ce0c4d25 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 00aa4e5c..2381ada8 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 @@ return "////////////////////////////////////////////////////////////////////////
 // Copyright (c) 2000-2017 Ericsson Telecom AB                               //
 //                                                                           //
 // All rights reserved. This program and the accompanying materials          //
-// are made available under the terms of the Eclipse Public License v1.0     //
+// are made available under the terms of the Eclipse Public License v2.0     //
 // which accompanies this distribution, and is available at                  //
-// http://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 1493ea8f..c81c8f29 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 104bec61..687276ac 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 846903da..5c8fad4c 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 877a3492..e2193a56 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 62eadef3..c13ff0d5 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 48eea3f1..c302241e 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 9856779a..feea464f 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 9e7e3d0d..dd904d33 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 d4d33cce..c0dd99ac 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 541c4fef..23b8ab5b 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 b105a518..89fbf77f 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 2a8cd12a..f42af7b6 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 0d0a324d..75b179cb 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 47da4b30..1029d5e7 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 17d12194..9e5ee802 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 896a81cf..a44c4ba8 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 e6c2c458..cee02774 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 1bbe958c..6f9a253d 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 9d847dd2..ab1558ca 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 fac06a3a..33b6e800 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 91356ef1..8e6842d6 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 aad5230f..967d45e1 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 50121433..e4b65bb0 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 fc460c19..32ec3fbc 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 b173e40d..d8be9507 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 d376f164..728c3fc0 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 90db874a..edb6e52c 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 d4e2e9c0..5830516f 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 63380582..63b71870 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 8e793d09..9a83463d 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 dabf01f9..3db81cdd 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 c330df6e..27e1ed7b 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 4ac731a9..02cfb3b8 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 6e370d7a..c21d1097 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 1cb4c8c4..880aa9f4 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 47799b88..5f1b0ba3 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 02ea8fc6..c94120f1 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 9829dc3a..8f3628dc 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 a6482eff..25a88d36 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 4628a5e8..93dc6468 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 967f2721..523e9959 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 75d6b734..aa425080 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 49948a9a..fec1cd6b 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 3e873304..8af6bcaf 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 30d05e42..2cdcb88e 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 d2c6ddc8..4af162c7 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 c68f1601..82442897 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 b29bf5a8..3f6fd8b1 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 f2dd1eeb..a1fedea1 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 a053d35a..d60c59d0 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 f1740b45..f6bae158 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 dc8d966b..ceb9191b 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 3e355ce3..e1e52b29 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 8a8d53e1..9b061f1b 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 09ed5f42..6e9a5629 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 fa2e6633..5b77b90b 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 87318a2f..38b0370d 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 3a58d3eb..3982d4ac 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 f54d1c2b..3c86e6f6 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 31674409..6b229b1b 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 7456d0eb..ac2b4068 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 a5f87120..00bc0b29 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 47eaf597..d30f2244 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 136ceb3f..e2971dfa 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 03ce7256..0fb8eebf 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 e6b90949..d688492a 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 02691a9f..7058e8b0 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 e31bf90d..b08abeed 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 633e1e69..3812506f 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 570ecc11..a1894af1 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 abd9a742..516ecade 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 80a6b9cb..3ec22f86 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 d2793bc7..91033d8f 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 1d5f07a6..f7d15a9a 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 4eb0cf12..ca4fa1c7 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 f1127c3a..19320219 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 92e3341d..3e937474 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 85277be9..acfcdf5d 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 bc01845b..1b3dd1db 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 decc87e6..a9484e7a 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 3f49fab2..97103fe7 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 d8732594..a33cc7d3 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 cb16bf30..e81d0014 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 72e39945..3fe0fb9b 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 2c18ffb9..da6b5838 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 a76d8825..216173e7 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 44713476..bfeaa601 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 6e1c91aa..c4c31768 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 e02ac2fb..ec5fe042 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 54686ea5..5a5c0203 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 1bfc93fc..455d110f 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 1bef5a48..ab61d849 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 46b97e8b..c56c38b8 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 75c5cbd6..bb174e88 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 3da1f9bb..80fc579f 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 8a8dc4a3..46f7790e 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 013ed8b6..b826271d 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 0632c6b6..cca1f942 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 acae3a10..fb73c629 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 14a8338e..171af643 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 3e9d71be..d11457ed 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 3fb9676a..3d722654 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 26b57ae5..6331b932 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 3de5ce15..46f4fa62 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 410e478b..f44de978 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 584d4881..acd0950f 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 341d4772..54f70500 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 b54aba14..1a5d5b01 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 39bb9321..eadb87ff 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 96c7c69b..4c61222e 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 ceb5b55e..3d2574a5 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 dbafb22c..ecad041e 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 12c02cbf..815235f4 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 cfb272c7..90c703f1 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 05736b6d..2ac5b0c0 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 3fd23bad..63e51714 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 9ebc3780..962b08fb 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 830697d0..25151a53 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 ced48641..4948c9d2 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 86c313e5..fdce7aba 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 90b63cc0..2d9a3e97 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 62281230..9d188b87 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 1e5b8be8..dbb2ac66 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 e7af1e7f..781f11ac 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 7efda69e..50c418f1 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 6b00659d..d2f38eb6 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 c32d4aa4..fa2a8c66 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 3a7b5a51..1a749a05 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 deb03cde..a7b26f6c 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 e8317af7..821f61ac 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 f85f6a66..f46eb8da 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 ebe129a7..e2681399 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 46b88a13..c676380d 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 d7815699..4250c25f 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 f98ad831..1ad5b4b2 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 f7a3bb93..17f74e7a 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 89cff471..6d1c27a4 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 fab18fe9..19413813 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 1a06f58e..5159e2c0 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 86df0253..74a49aec 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 cff8ec38..a5de8a44 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 bfe97b78..077bb06e 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 311bf018..e2497dba 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 b1cd9530..254d06d5 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 5534d6b9..34bc18e4 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 1488790d..5eb06dcb 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 15b7c472..68a32631 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 f6ab89b3..77bb5c4a 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 c6a694a5..2fda6d44 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 48c3863c..98ab2635 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 1f238b72..1e949508 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 cb77db41..4ffcee83 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 1157bd67..8d8d54c3 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 a2dc387f..0d1f9009 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 c4f16cd2..b02cb0e4 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 797446bd..448f2755 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 68489cef..785cfd8c 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 a6ac715e..d95dec42 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 de6b966c..e674aa5e 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 3faaa27b..13cd0d86 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 ec5db7e7..42004d9c 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 9467067a..85a33e07 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 dfeb8cf8..7d743a26 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 bc1d3050..95ea0715 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 0ef62f22..67f90d24 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 40a6cebc..415fedd1 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 647a695f..88d1c98a 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 e7bac631..e3577ff2 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 c97c533b..cd52fb3e 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 36e88b26..6c1398ba 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 30e95b5c..f5591705 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 bf0582e0..1d94b290 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 03313385..a6bf77e0 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 699c8e8e..772238f3 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 325e442f..bb6bb6e9 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 b75bb139..41ee5078 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 b72a1fc0..b459fec2 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 646158be..46832736 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 66a41d42..803e176f 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 2583302a..4d7cf457 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 b188ac12..de3c1019 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 fade9bb3..de973d4b 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 82364b18..642a1d53 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 ddc666e8..57c5ccf0 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 783a3747..9c3bad48 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 d9ee94ea..3a4673db 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 302ee07c..d73bd703 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 4b8d1c07..d4adbec2 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 731fcc3d..890c7d75 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 ca574ba2..83ca94da 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 d0070dda..d5470ba4 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 712b5361..4b388276 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 4e0ffe41..445cafb2 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 a8a29d40..026c9712 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 fb564718..ce780c8f 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 4e822101..fbcdf399 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 e62eb73d..2d063ac5 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 76a6c189..804625ed 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 a80ea03d..c92e4f66 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 81415170..fdf8e162 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 44bc23e8..be2581fb 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 31cdbff7..d3a8146c 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 38928f91..527fa296 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 58c1417d..363e4344 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 348d5d20..f2b11c99 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 7297b209..ec33e148 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 bd5e7cdd..39d3f1b2 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 d081ee84..e29bcab0 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 5a741398..58e114c5 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 dfb36373..f47f016a 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 b707c190..54e836bf 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 58c6a1e5..e7bf25e5 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 7fdf1777..87e3e114 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 db47a69c..fb049dce 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 7edc1b46..92911541 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 b260daa7..7572bff3 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 0d068d3f..b5aa0258 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 cc7e742a..3870642a 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 87103473..9f38711e 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 108149a4..2df0096c 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 464267ab..37ca12d5 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 55c73847..8d5edd07 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 49929935..549303f8 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 c9ceee88..7e741a9e 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 6b8a8e91..b466c669 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 1b7a32a5..0e37123f 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 8c001e02..b22a633c 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 353aff79..6da2d23c 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 aece7674..6e0c8de0 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 2dcda2b4..fe86f35b 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 86bb821d..ea167953 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 58a8a57a..8f74d902 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 cb80f3c4..7c33f9c0 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 caf0de1d..f4bdcde3 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 52d77b37..50e82419 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 0c381dc4..aa097277 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 66fb320c..756dc679 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 98281af3..2aff1be6 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 ef5f5110..68566fe9 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 1603b12e..6821701b 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 86adc76e..be4c0293 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 4697fd77..a4c260c0 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 9349d532..cc4f4e69 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 fa2e0d0d..813abf5b 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 0096e7e3..9177af9e 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 93f599c7..baa6a6e5 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 776c7254..9700997b 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 0771c42d..610575e3 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 13257427..3538635a 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 dc345fc5..1c490780 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 52327538..ba5ad9eb 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 6ddb9973..6e02d39b 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 325e2a57..4269029a 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 0e3e705a..17e89043 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 b0be1b73..4a2c1324 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 53ab14c1..f8441a97 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 22e519e2..03bffbdf 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 4261a11a..3019a2ed 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 b42a476f..690a40a7 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 8199c993..7d99bef3 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 11e47d1f..dc7547e5 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 ac3340a2..2147352b 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 d6488365..4b99482f 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 7d81e2a8..2929bb6f 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 8412cedb..c9c3ff7a 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 13cf99c0..29f31eb0 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 86cbb3d7..01610390 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 edca2234..4dd8b6d6 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 dcc1912d..86cda97f 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 7fa4cf49..f1639434 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 92210370..e730f5b6 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 436e5cb7..5801248b 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 7b127943..c68bc30c 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 1f7caefb..76f28137 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 215e2771..53b0215b 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 f87c282e..021cda73 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 bc8f007a..5a810c83 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 77d16f35..3afda3ec 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 67b67cbe..49de84df 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 f13e9600..a0987bd7 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 5078a410..a644f550 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 e2b048c0..2d400177 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 437d6422..fc43500c 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 6e1cdff4..407f3fee 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 831ead0d..e8b57e47 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 566288b0..fc4a3c88 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 13a70aa4..dbdf8818 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 e6401262..b418c321 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 7950fe45..fd1b537c 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 99634ae1..9e33fe35 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 a416ee49..9585688d 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 d0d17ecf..78164059 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 bfd976df..942b2b78 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 4646aeea..4e5493ed 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 27c81453..1e772f42 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 01b2fbf4..10ac1b7b 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 131c2eef..4c24faf5 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 7b5d8897..8911d363 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 4dc1712f..58622285 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 f0df3fb8..ae0ee1b2 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 3d5406e9..f61ce5a9 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 36e9ca4a..e845f3e3 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 b4be9c6d..2ba6c9bc 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 cdd0248b..772b0473 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 f23fea7f..563a591d 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 dfea0b28..01ef74d7 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 e2f6236c..da22defd 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 1cd61cf7..c52ca568 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 1ac9006e..79f81fd9 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 1cac3eab..a95a70c4 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 e1800415..2936f926 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 7ea47729..1535226e 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 263e739f..c8954a75 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 65718a02..c6e062a4 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 c7803aed..d815f6fb 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 6c8dcec0..e17aacc9 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 e9b95b64..276811af 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 76a03be2..dc04715d 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 0159543d..c1a7730e 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 6bb7c5b5..cd16d8c5 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 30e68226..de2d6fd7 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 1c635a3d..1385fa3f 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 d44b8e1a..c1d72761 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 b735a4f2..1ebe6c24 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 bda5a492..ff38e7ca 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 e66cb5b7..977bd02c 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 ab64699b..f38985fb 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 1d1cb5b0..20104e9e 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 34de04ad..29d1c374 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 eb7f3983..7fce9310 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 ea71a5f4..8b9fa939 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 cd37e58e..05a86280 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 26a02e52..64d5ed1b 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 f74b0936..0d72fc1d 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 e9cf5b60..ceb4a428 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 d5dbeaa1..e5808a1a 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 f79485c9..12080b74 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 e4ad08d6..8f898506 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 fc52c49c..0cc2060c 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 93168a84..66b24932 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 c8fe637d..863853e3 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 19dc7688..0f7afe74 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 eb38bd06..ed9efaf7 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 c1345b30..fc866bac 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 5e9c2bcf..0f7a53a7 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 f991a651..812c6a91 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 baf82c81..80d636df 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 85400d4e..a9e9604b 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 7a3a19e8..c6f35d33 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 38e0de95..7fdfd6fc 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 c69a1753..0c89691f 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 0aa01376..8ffe6d54 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 a6ced026..35d83d4f 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 ad9595b3..f2791791 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 d915356a..5d2c181a 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 c5147168..01ad14c3 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 d68fbcd9..8482c3b3 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 c615250c..1f2f6fd6 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 58cdffd3..ca9ee06a 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 86102c8d..57e1679e 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 25b0ac66..c3366022 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 b25dcaf1..754f7ec8 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 447ae10b..f5169a51 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 69d609de..e9f02389 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 ba69c4da..ac0239b5 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 9cc51e52..2b6c4dc5 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 88ea7b16..502174b1 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 23133429..fbe49732 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 84fb627a..aeb5c446 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 353018ce..ff5bb370 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 7f8d22a9..efc2b704 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 53ad1522..b9c98812 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 2e8c6a58..d22d2827 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 198ab1dc..06df46dd 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 5b2cca5c..493b4d7d 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 1a958a59..973096f0 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 984fddf8..483d8d6e 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 dd8f3a04..e2a287d5 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 3a1cb8ca..555764f7 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 229deb24..b3b00a06 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 49c2860d..3157bd3e 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 78af6ace..2ccbef26 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 384f573a..1de84f49 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 e0e0065a..1aa95e8c 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 63f18ee1..f12d86f2 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 05790661..c11fa7c3 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 f6ad098d..c7f5b9e7 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 1c62dd54..4ea4cdb4 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 78f06569..01be5151 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 fa5a29cb..504052ea 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 d5e8af3a..0a1e47e6 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 87d89991..da252e69 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 e59469f5..27fe3fa0 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 f5f3ee55..0098d565 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 d47da9e6..3ea39765 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 c6e83e9a..ed21ba17 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 362a4afa..9a63eb5e 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 794e8ba2..11cad344 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 6c6b418a..364616e0 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 7bd535ee..f57298e2 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 b05240f4..a2a3d29a 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 e321f73b..c1474c9f 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 877c55a8..5bbb0dd2 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 39d055df..7f3f6b98 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 94107190..3cd08d6c 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 78fd6ec1..64d1adc0 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 6bd45e6e..00d94b54 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 39929946..229314d6 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 cfcf58be..031e73ef 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 bb09051e..b9039c8e 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 347fe3ef..af47697b 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 51b8ed25..d4da6b1a 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 d86607a0..02a40ca1 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 ab1bc71b..d3fa366d 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 1568d534..02dac1c0 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 c48c3064..cad16482 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 6980b3c8..25fc3352 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 94caab64..837de71e 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 9944831d..e30a6e1d 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 671ea89f..0cd7e468 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 d047516c..21b0fef9 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 68f6d913..dc71e28c 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 c87834e8..41016543 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 7eadbd06..671d7d94 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 d016ab7c..c8b5a032 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 411ff692..ed235a25 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 d3a0a608..ec2a8c35 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 aadeb2a3..80d7ace5 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 3e0a79c3..6d212e5a 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 6fd2fc17..bf31af4f 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 591c2edd..b01d98f3 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 5c0ca31d..90dcb2e8 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 4f857941..4d112c3e 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 a5da7f98..d3a66983 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 e21e754f..2a8e0538 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 d11ea316..e2e81e6f 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 1000c42c..0c3ca509 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 a388615e..08d9027a 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 c7c5d55c..8ba713ec 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 03665e46..878dfa51 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 3576db94..64d22298 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 75cdfe57..82de080a 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 9dc7f67c..e961cb98 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 4e28389e..5d9b1d39 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 7859542a..15010c5e 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 a944348e..f6e7cd41 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 6020f531..dd1c373e 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 308aa33c..432fa05e 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 2e93daf7..e227c971 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 35d131dc..272d4a1d 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 e043226a..e8617bc9 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 a736208b..28958735 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 a314f9e6..f7c17708 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 5d032ec2..085e399d 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 35cb4a17..0d60eda0 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 814680b2..d015fd91 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 32ded64d..aec02cb9 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 70849110..968eb6a8 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 bf45fc36..d7b48165 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 dcc1c117..fa3d64d7 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 8ef48969..e70bace6 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 578e75d1..fad54659 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 3b3f3969..f0b14afc 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 c29b64b2..19a2210d 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 49e151d4..81a6c236 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 68c27f98..a9ad4773 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 397274ae..53a9a9a8 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 fb822b0d..99b99cd6 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 d8b70af5..a8c7cd38 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 dcbf05d8..7209659b 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 b3178541..d4eae189 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 e7d29817..ff20de33 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 bcc3bb50..432e399e 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 a3b6e3fe..48187ca9 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 fe1f7eba..a9d2aa5e 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 f751d281..16a0e9a6 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 e2f8f420..0c36be2e 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 e31713ad..cf72d5b9 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 75c4707d..9a59116c 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 5ffe3f2d..e632904a 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 b4288e25..eb398a26 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 92960d77..1be14a0a 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 92a8bff6..9a7cb50d 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 a2deaf70..dea8d38c 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 1be8bbab..45f8de1d 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 25aa9239..375cabc3 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 5fe89bfe..706e8901 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 7193afd4..2f47ba44 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 e07400d4..48ac0532 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 5e5299f5..5584cb0c 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 99c8c42c..042653bd 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 a919b6a0..76612ce7 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 36a494e0..847655f4 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 f1f377bc..739fb222 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 132de16c..d63abf35 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 12c3eb42..9f4ff6aa 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 7fa75ba6..5ef86c59 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 b602e1bd..f5569138 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 f8ce9ba0..6486bdaa 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 73eec3ac..d083aa85 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 fec2d008..ca195f7f 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 59d7de3c..358e2d08 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 2cbf3f09..0ba9bb5d 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 aa9337fd..5c42d0f6 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 555b80b9..4b5e5366 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 66d77328..24aa58e4 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 db83c7a7..9315b04a 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 0eb97ae0..1d889be3 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 1a3ac25c..16236ee4 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 751468c7..f060a87f 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 d65f60fa..e8960b74 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 6ce2c7b3..9a3da1d3 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 2e0e8b7f..f0ffc79d 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 6231ff7a..7371e812 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 0bbaacd8..cda624c8 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 f0383142..13aef234 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 edd7d811..f2506ed4 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 e1ed550c..be5fb504 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 bd4fbfd8..a9874d66 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 2372337f..979b8e20 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 6eacaa10..df45919b 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 720140b2..6b32c371 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 4b4dc280..53282912 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 952f385c..86d7367f 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 a46cc194..da55cd31 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 b325fcd0..3cc990dd 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 b437a6f8..3312082e 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 7169a0c8..a76a8642 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 1f3b3692..993a1b90 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 fdb14fda..0dc5c3f4 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 f61bb82f..b44a70ce 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 2daf8265..4d303365 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 693368eb..9d3ae4ac 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 6c0aba55..98472ca3 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 d22a1cbd..eca4693b 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 994540fb..b39f3800 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 6517d75d..6fcd0d5c 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 adf2b64d..9e3d8136 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 9c9786a0..af2c4890 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 b6726b1a..4ed4694e 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 8dcca5b9..eb852f23 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 dbf0b71c..0b584142 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 f6f0edd9..435350f4 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 35c5c3e3..c9999f5d 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 e4d1bc03..ebcc8aba 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 9b3958d6..3980fd8d 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 b2b4c2da..50ee596c 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 37daed63..68059439 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 ab065bb2..ec81e533 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 aef794a1..b4930f19 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 cbe93538..42b7f449 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 4cc7931f..39dcf505 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 df10562f..6b7693f1 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 da3fa33c..46b8d054 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 4c38d959..9e7d407f 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 c26cc067..a5018784 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 80e24dd8..66a1fcd6 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 20e2bc01..b120256d 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 ce8db304..222a4b13 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 85bbe374..d76e4f3b 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 97356ffb..13947238 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 c2c1d0b5..39ded75b 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 747df640..44dc27e8 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 c773aab4..42e361a3 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 8781360c..52b00faa 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 2d390ee3..8069829f 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 e4ddad9c..3052b8f1 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 18e96cf0..16ae2dbb 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 15b9ff62..05842597 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 f9d64601..f7bcd73a 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 0209bd92..24ea0567 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 649953b1..48fc72b4 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 57f5d389..a92f9ee5 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 14569527..8db3c520 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 b846682c..db802e22 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 8009692a..db171070 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 a6a9cf0d..815f211b 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 eb4c81d6..2b0e2fb2 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 93d4e885..07bc0470 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 7dcdeec1..631a02d9 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 98b980d5..b9941371 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 8e7b792a..7538ebbb 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 cb0882ed..f8369572 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 cd2dd8c9..00494874 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 3837c8c0..2ce4ec3c 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 061d9a63..8cd95fda 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 4ee8bb71..01f79a9a 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 d0889fb4..86091027 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 3070d3df..54b27c21 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 e54269c9..bb26445d 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 6af6629b..e55d72b8 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 7839ce87..e1fb40bb 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 d83c4784..2a664e4b 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 30250dd1..e557ec9f 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 19517f9f..0d0248f7 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 27b408f7..07bf52c5 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 3b93dedd..ba96f8e7 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 1f6bd6d7..43351e17 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 870dd4e3..a688d06c 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 22561ef4..8a95594a 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 5fff97b1..12f77da6 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 2a237ca4..f5366171 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 3b0df5e8..489a8ac4 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 eef0b0b5..bfcd969f 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 7648d1e0..e8e13510 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 e156eac8..9a9dbc42 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 d5520892..039a114f 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 cc5d9fb0..193cb35e 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 f6c68db3..a709ab07 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 f0981556..12a2a3c5 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 529da59e..ab659469 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 6c07f864..261e2f09 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 ed51b362..22337901 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 32824822..416653db 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 a9142ca9..f40acf7f 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 ef8a554e..0592ddfd 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 b5a28058..52fa29e0 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 3c64af9d..2de6ab01 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 2fc71db4..f4e8826a 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 eee4438f..bcfb29ee 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 7cb28535..a885e1da 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 0a9ef0de..0c091ca1 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 03ddb9a3..d306fa64 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 3cf1a859..e75da1ee 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 09583405..2657dcaa 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 b55b9d84..8796134f 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 87802697..b2004eaa 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 50b879f6..a5c163f2 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 d49849ac..96d504fd 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 64acad46..f6944576 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 e3cf0a9f..6b409cc0 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 bc00401a..62157bc5 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 2dad4c3e..e151702a 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 42c7c4a5..fcdccb3e 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 3f0614ab..ba03fe3c 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 865b5295..b516d48b 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 9b1e613b..01d8755b 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 4575f552..87456129 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 a77ad415..2777309c 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 51a99d17..851c4db7 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 c12071f6..9c53c1ee 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 16cfc134..5e1a0798 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 52301778..d21d22c1 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 839c05ef..4dc479d8 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 9cd0226d..81a5d20c 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 b121828c..b40b43e6 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 69d38b7c..da32e778 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 63d0ce81..12bfcfc2 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 48dabc15..cc27253b 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 c273f67d..4ea79973 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 329d8dcf..bff833be 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 66c1b95a..71c08013 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 c5ac8377..e1249b98 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 ccfe961b..9d3a634d 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 14569527..8db3c520 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 de29236f..6de4a916 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 63831b85..8a9293cc 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 0cb90ddc..77b08535 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 1c1a08b4..9e2431e5 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 ecebba84..af84f4a3 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 492a33ed..314e5a07 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 4e08bab7..16213d8d 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 04a54053..eaa44ab4 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 56c437ee..064ce090 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 c752c2e4..bbed6e25 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 46e2bd53..31d69ccf 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 092f3905..665b81b3 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 e1a46f68..665f99de 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 a75238e9..1a6ace93 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 56ca7177..5bd60575 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 0b0756d0..74f59535 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 0a25bbc3..40701cb6 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 43b61ea9..2b6c45ec 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 477746cf..35957872 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 ac565c8a..1230f25b 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 bce7d583..fd8659bc 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 3667c650..7e85439b 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 47ba95a8..493de758 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 4eabf3d6..d57364fa 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 4a2ce64e..33dd48dd 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 973e978f..d35b76eb 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 eb061f16..1efd90b7 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 c2e21485..23298b91 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 7eeb27e5..6bef98bd 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 1eee44ac..734e9768 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 4d32c3b6..d4043b36 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 476c1df7..4ddf284b 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 cc85e301..78c8cf9e 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 fdb16e42..718be17c 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 75dce879..206d1469 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 2d41bfd2..5680e5ce 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 e25bf249..b93c17af 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 35ec1d86..47cc6368 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 dc49e308..a56f958f 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 7426a8ce..2ec5ed14 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 f6453410..1d1152e0 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 f051fd03..c6d9db19 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 7960a6b6..21e83f73 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 d2fda8d1..e5ded48a 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 91d02f6c..ba078ef5 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 b201e147..daedbd45 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 958c81e8..42b6347b 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 f838802f..76f65757 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 a0573327..1ebda7dc 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 4232646c..46c68494 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 b95b4aee..7fb1b539 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 ece77a2d..3b44dd45 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 64b3cda1..f7326fe4 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 e56f6fb8..55e4f1b9 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 7be36fef..7858e1dc 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 8c1b613f..68c46594 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 6d9cef23..5e24543e 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 bf68cc48..54601a3b 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 37e30e45..debdd550 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 39de0e1d..2a15b89f 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 df970a6d..de8651e2 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 88ab14fb..77307130 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 2100b7f0..388d2b67 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 f203d76f..d34b6b75 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 2bd1aef2..ba74562f 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 7e044dd4..cb7bd57d 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 dc39c355..ac1f7276 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 062b2754..b66548c2 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 1ce1b845..b417f406 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 4379df75..80c6ca05 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 ac6deffb..add83a15 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 81a884ab..58f8ed42 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 83728824..998a623d 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 01f7f5d1..cb725442 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 a82ed069..00e56e3e 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 d958da1e..7a9d6ec0 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 02f2be1c..2f761d3d 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 7aed9024..5b071e71 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 1dc95943..730366ee 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 64332084..410fc864 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 acb05a79..6d8a9471 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 f6e08bb2..07cb7277 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 9a96544d..ee9c946d 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 c6708448..fe715aa4 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 6aa05bce..16c3a146 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 8b9315a9..74eaa380 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 5df7bc53..5f9c867a 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 e33b2104..a9559696 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 f68f6de8..c768a307 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 99b2f0be..b73f14e3 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 7c3ce4fc..235bfe6a 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 5e2ea4e4..bba28b09 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 f2f57214..88979d8c 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 753eb210..6930c1a5 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 c63d10b7..ca04cc6f 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 a6cc48dd..6d9f7dbe 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 dedf30c3..eff749cd 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 7cf5c023..50981122 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 90eea3cb..bb1a7ed8 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 a931e4e1..575416fa 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 1b8c7821..2b03c843 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 8530aa29..9b6e2a08 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 6ed2051e..cf29f18d 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 1d8581bc..47f7efe5 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 291bba97..043a20b4 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 dad09020..14b31832 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 7312dcb3..8998a4cc 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 0013c222..31abc1f8 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 26f2af98..6c0f5230 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 2498d868..fb60ae21 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 3636a867..6ccc7c2e 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 d62dc730..311cc74b 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 b76d13f8..153f1823 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 059c47cc..deb7a7cd 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 a90258fc..bf93f662 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 d7a7298c..79508047 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 2de230f0..707486bd 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 d3a0a608..ec2a8c35 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 d264bb7e..875540cd 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 71812f4a..981ecbe9 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 52bf4175..bcdcb454 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 527e5671..3d62fca9 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 d19c66d0..4ae60b30 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 9f2510c7..9c5ef049 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 3a83cd0e..7db620cb 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 1ce3b344..493f4eaa 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 83255194..7824057f 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 8f6bd1ab..e525c857 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 611762c5..b2d9eb05 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 c242fde3..c204b9b3 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 ad9b534d..b375b37b 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 6f98c24a..6001a741 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 6ea49e28..45ac770b 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 8fa0fc33..eade64d0 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 8b9315a9..74eaa380 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 be6d213a..23fc6bb8 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 2421bc8e..eb0284e8 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 388c8213..1a087a38 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 4bc61cd0..a4bb71ea 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 1f55bb77..a79a4bc1 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 c1712acf..3dead0d7 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 99ea170c..6fe68e41 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 ec947b9a..09a45cc9 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 f30a636e..a5173a10 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 7992cd86..f589d599 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 fe94ed8a..98085321 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 1b7d44b9..dc27fb48 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 a2c9bb1a..09d92be6 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 8cd4a3dc..d418097f 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 050fa54d..6511a7e9 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 4c13d10f..d8af6152 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 62348640..4ef233b6 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 2cf73e04..3535e6ab 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 7bad155e..8a5c8d08 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 f3563ba9..7c8a1ce1 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 126e7c5b..59ab45f0 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 2a1635e0..e8ec968b 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 6043bc32..96d547bf 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 9cfe51f5..18c10612 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 d675f3fe..f7945c24 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 04f64c41..caa72e2d 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 2deaece3..1eec11a7 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 0ca963f2..79af4d27 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 3249fd7d..7ac45a06 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 2e4bcdad..5b1555ea 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 cae5c5fb..2bf6344f 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 20de3ddb..db5aa615 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 ad17d38b..6b38512e 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 6c1a1deb..ab0fa0c1 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 bb2f7695..30636820 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 0009851f..558340f8 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 e74a4b85..024374fc 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 a7ddff3a..798ddbe5 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 b8da863f..4b5d42e3 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 c658b3ea..8ec547db 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 d765e5ba..1f5a4b57 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 a6bdb109..81063524 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 c6ac997b..a7f6657f 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 6bcc124c..36ea0bbe 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 d19f6979..1140bd22 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 e2304063..904fc5b5 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 fb88ff75..4940c4eb 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 ea9cc746..95ecb74d 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 4fece516..1cdf810b 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 1aef0a06..1c279a14 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 9c0f6a77..e9afb0d6 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 b86b686c..070d0d77 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 1cf7c730..7f7f2c31 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 fce5cece..a82a10b7 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 907dd327..eab9291d 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 154c682d..91486308 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 f0a1e77a..f66801d4 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 5f44c234..0f3bc5db 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 7b4baed9..9ab88d97 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 43d336d6..82200fc6 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 ce88a7c2..8b4f921f 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 cae6f8b5..6f62760a 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 5d395441..9f44c970 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 4fce3d0e..1a6923bd 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 95ec817f..f6907c86 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 23bc09b6..861094b6 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 b1c5df1a..276e73e6 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 73fa21ce..946e50fb 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 abf90179..a69469ff 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 b958c19b..0d6dc0e6 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 000fefe6..37532f8b 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 dd2439c9..982217a3 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 38df9f25..4371efd8 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 ba12f9e9..f3452cd7 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 967aaf93..5506522c 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 493a7e5c..d11aa938 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 98f853dc..ef67c01d 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 d2ee308b..df89d213 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 60d22a59..7e581134 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 021120da..5b4eca5a 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 c210a7f0..1e8a9c8b 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 fcd16624..9bf261b0 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 279f57b5..21e544d3 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 b3e1ff10..4ff8825c 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 93eb3bbb..3979447e 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 24034f41..58d029bd 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 664ee3ef..204b2093 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 83ad8b4f..98127942 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 b6084fda..4218cf69 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 84c4b065..912a0640 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 e8ae20ea..4b207119 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 a3a4f4f8..8c17def7 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 c0aa4383..2fccc347 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 f3bb1995..0bff199e 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 bb646c16..6d781a80 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 421bf282..873bf2dc 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 d89ccab0..58da4ae2 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 270ece02..ccd5419f 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 ad849a18..6bbb8e41 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 3e8d22d3..6e90d2fc 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 488f94b7..9f5120b1 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 7681fdba..84db1fcb 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 bf0eaa6e..d309af31 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 9999c063..825eaae5 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 a91ca027..c6986fbd 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 c4c0fc85..8eb3c35a 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 a38a0b1d..267ae480 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 d4b968b8..58fd6ad6 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 e2903dd1..1e74e0c4 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 76680ba3..a87c8cff 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 30dbbf23..b5469a9f 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 38c0f837..e69bba4d 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 5b44c57b..2b465a77 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 8e6d236c..b3ecd108 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 067c13a6..6de0fb3f 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 4bd7c03d..a8cf5e1b 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 1eb5dbc8..6e98ba10 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 38719f21..74be96ae 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 60c2efc3..42a760ea 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 91b18219..fab1a427 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 39855240..6e64ad2e 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 75fbc517..83291af3 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 ce04558e..314f139f 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
-- 
GitLab