From 0a678310796cb825cf052a7ff50e2092857f6d14 Mon Sep 17 00:00:00 2001
From: garciay <garciay@5a941883-869f-0410-b6e7-a816b635d326>
Date: Tue, 13 Dec 2016 07:52:29 +0000
Subject: [PATCH] Add ETSI legal copyrights tag Review CAM PICS Rename
 PICS_GNSS_SCENARIO_SUPPORT into PX_GNSS_SCENARIO_SUPPORT

---
 ttcn/AtsBTP/ItsBtp_TestCases.ttcn             |    4 +
 ttcn/AtsBTP/ItsBtp_TestControl.ttcn           |    4 +
 ttcn/AtsCAM/ItsCam_TestCases.ttcn             |    9 +-
 ttcn/AtsCAM/ItsCam_TestControl.ttcn           |    6 +-
 ttcn/AtsCAM/ItsCam_TpFunctions.ttcn           |   94 +-
 ttcn/AtsDENM/ItsDenm_TestCases.ttcn           |    4 +
 ttcn/AtsDENM/ItsDenm_TestControl.ttcn         |    4 +
 ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn         |    4 +
 .../ItsGeoNetworking_TestCases.ttcn           |    4 +
 .../ItsGeoNetworking_TestControl.ttcn         |    4 +
 .../ItsGeoNetworking_TpFunctions.ttcn         |    4 +
 ttcn/AtsIVIM/ItsIvim_TestCases.ttcn           |    4 +
 ttcn/AtsIVIM/ItsIvim_TestControl.ttcn         |    4 +
 ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn         |    4 +
 .../ItsMapemSpatem_TestControl.ttcn           |    4 +
 ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn   |    4 +
 ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn |    4 +
 ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn  |    4 +
 .../AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn |    4 +
 .../ItsRSUsSimulator_Pics.ttcn                | 1265 +++++++++--------
 ttcn/AtsSecurity/ItsSecurity_Functions.ttcn   |    4 +
 ttcn/AtsSecurity/ItsSecurity_Pics.ttcn        |    4 +
 ttcn/AtsSecurity/ItsSecurity_Templates.ttcn   |    4 +
 ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn   |    4 +
 ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn |    4 +
 ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn  |    4 +
 ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn       |    4 +
 ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn     |    4 +
 ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn     |    4 +
 29 files changed, 794 insertions(+), 680 deletions(-)

diff --git a/ttcn/AtsBTP/ItsBtp_TestCases.ttcn b/ttcn/AtsBTP/ItsBtp_TestCases.ttcn
index c166361a0..ad39385d9 100644
--- a/ttcn/AtsBTP/ItsBtp_TestCases.ttcn
+++ b/ttcn/AtsBTP/ItsBtp_TestCases.ttcn
@@ -3,6 +3,10 @@
  *  @version  $URL$
  *            $Id$
  *  @desc     Testcases for Basic Transport Protocol (TP version: 0.0.3)
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsBtp_TestCases {
diff --git a/ttcn/AtsBTP/ItsBtp_TestControl.ttcn b/ttcn/AtsBTP/ItsBtp_TestControl.ttcn
index e92c51810..ee064642a 100644
--- a/ttcn/AtsBTP/ItsBtp_TestControl.ttcn
+++ b/ttcn/AtsBTP/ItsBtp_TestControl.ttcn
@@ -3,6 +3,10 @@
  *  @version  $URL$
  *            $Id$
  *  @desc     Test Control file for Basic Transport Protocol
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsBtp_TestControl {
diff --git a/ttcn/AtsCAM/ItsCam_TestCases.ttcn b/ttcn/AtsCAM/ItsCam_TestCases.ttcn
index 41c5a814f..04e3818b9 100644
--- a/ttcn/AtsCAM/ItsCam_TestCases.ttcn
+++ b/ttcn/AtsCAM/ItsCam_TestCases.ttcn
@@ -3,7 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     CAM Testcases (TS 102 868-2 V1.4.1)
- *
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  */
 
 module ItsCam_TestCases {
@@ -131,7 +134,7 @@ module ItsCam_TestCases {
              * @desc Check that specialVehicle container is included in 1st CAM 
              *       since CA basic service activation.
              * <pre>
-             * Pics Selection: PICS_CAM_GENERATION AND PICS_SPECIALVEHICLECONTAINER AND NOT PIC_RSU
+             * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR)
              * Initial conditions: 
              *     with {
              *         the IUT being in the "initial state"
@@ -167,7 +170,7 @@ module ItsCam_TestCases {
              *       special vehicle container generation is equal or larger 
              *       than 500 ms.
              * <pre>
-             * Pics Selection: PICS_CAM_GENERATION AND PICS_SPECIALVEHICLECONTAINER AND NOT PIC_RSU
+             * Pics Selection: PICS_CAM_GENERATION AND NOT PIC_RSU AND (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR)
              * Initial conditions: 
              *     with {
              *         the IUT being in the "initial state"
diff --git a/ttcn/AtsCAM/ItsCam_TestControl.ttcn b/ttcn/AtsCAM/ItsCam_TestControl.ttcn
index 9d9adeb08..3957752df 100644
--- a/ttcn/AtsCAM/ItsCam_TestControl.ttcn
+++ b/ttcn/AtsCAM/ItsCam_TestControl.ttcn
@@ -3,7 +3,11 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     Test Control file for CAM
- *
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
+*
  */
 module ItsCam_TestControl {
     
diff --git a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
index 2b31e6b79..310ce8d47 100644
--- a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
+++ b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
@@ -3,7 +3,11 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     CAM TP functions
- *
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
+*
  */
 
 module ItsCam_TpFunctions {
@@ -93,7 +97,7 @@ module ItsCam_TpFunctions {
                 
                 // Test control
                 if (not PICS_CAM_GENERATION or PICS_RSU) {
-                    log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                    log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }              
@@ -147,7 +151,7 @@ module ItsCam_TpFunctions {
                 
                 // Test control
                 if (not PICS_CAM_GENERATION or PICS_RSU) {
-                    log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                    log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }              
@@ -238,12 +242,12 @@ module ItsCam_TpFunctions {
                 
                 // Test control
                 if (not PICS_CAM_GENERATION or PICS_RSU) {
-                    log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                    log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }              
-                if (not PICS_SPECIALVEHICLECONTAINER) {
-                    testcase.stop(testcasename() & ": PICS_SPECIALVEHICLECONTAINER needs to be set to true");
+                if (not (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR)) {
+                    testcase.stop(testcasename() & ": (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR) needs to be set to true");
                 }
                 
                 // Test component configuration
@@ -294,12 +298,12 @@ module ItsCam_TpFunctions {
                 
                 // Test control
                 if (not PICS_CAM_GENERATION or PICS_RSU) {
-                    log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                    log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                     setverdict(inconc);
                     stop;
                 }              
-                if (not PICS_SPECIALVEHICLECONTAINER) {
-                    testcase.stop(testcasename() & ": PICS_SPECIALVEHICLECONTAINER needs to be set to true");
+                if (not (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR)) {
+                    testcase.stop(testcasename() & ": (PICS_PUBLICTRANS OR PICS_SPECIALTRANS OR PICS_DANGEROUSGOODS OR PICS_ROADWORKS OR PICS_RESCUE OR PICS_EMERGENCY OR PICS_SAFETYCAR) needs to be set to true");
                 }
                 
                 // Test component configuration
@@ -441,7 +445,7 @@ module ItsCam_TpFunctions {
                         log("*** " & testcasename() & "c required for executing the TC ***");
                         setverdict(inconc);
                         stop;
-                    }              
+                    }
                     
                     // Test component configuration
                     f_cfUp();
@@ -504,7 +508,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -540,7 +544,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -576,7 +580,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -612,7 +616,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -648,7 +652,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -684,7 +688,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -720,7 +724,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -756,7 +760,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -792,7 +796,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -828,7 +832,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -864,7 +868,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -900,7 +904,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -936,7 +940,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -972,7 +976,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1008,7 +1012,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1044,7 +1048,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1080,7 +1084,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1116,7 +1120,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1152,7 +1156,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1188,7 +1192,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1224,7 +1228,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1260,7 +1264,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1296,7 +1300,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1330,7 +1334,7 @@ module ItsCam_TpFunctions {
                     
                     // Local variables
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1368,7 +1372,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1404,7 +1408,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1440,7 +1444,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1476,7 +1480,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1512,7 +1516,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1548,7 +1552,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1588,7 +1592,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1651,7 +1655,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1712,7 +1716,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -1774,7 +1778,7 @@ module ItsCam_TpFunctions {
                     
                     // Test control
                     if (not PICS_CAM_GENERATION or PICS_RSU) {
-                        log("*** " & testcasename() & ": PICS_CAM_GENERATION and not PICS_RSU required for executing the TC ***");
+                        log("*** " & testcasename() & ": PICS_CAM_GENERATION AND NOT PICS_RSU required for executing the TC ***");
                         setverdict(inconc);
                         stop;
                     }              
@@ -2589,7 +2593,7 @@ module ItsCam_TpFunctions {
                 // Test Body
                 v_expectedReferencePosition := f_computePositionUsingDistance(v_referencePosition, v_changePosValue);
                 
-                if (PICS_GNSS_SCENARIO_SUPPORT == false) {
+                if (PX_GNSS_SCENARIO_SUPPORT == false) {
                 f_utChangePosition ( valueof ( UtChangePosition: {
                                 latitude := v_expectedReferencePosition.latitude - v_referencePosition.latitude,
                                 longitude := v_expectedReferencePosition.longitude - v_referencePosition.longitude,
diff --git a/ttcn/AtsDENM/ItsDenm_TestCases.ttcn b/ttcn/AtsDENM/ItsDenm_TestCases.ttcn
index 68e739985..00f50f2a2 100644
--- a/ttcn/AtsDENM/ItsDenm_TestCases.ttcn
+++ b/ttcn/AtsDENM/ItsDenm_TestCases.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     DENM Testcases (TS 102 869-2 V1.5.1)
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 module ItsDenm_TestCases {
diff --git a/ttcn/AtsDENM/ItsDenm_TestControl.ttcn b/ttcn/AtsDENM/ItsDenm_TestControl.ttcn
index 0211445e4..deab5e264 100644
--- a/ttcn/AtsDENM/ItsDenm_TestControl.ttcn
+++ b/ttcn/AtsDENM/ItsDenm_TestControl.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       Test Control file for DENM
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsDenm_TestControl {
diff --git a/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn b/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn
index 0a39aa0eb..c1a546c16 100644
--- a/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn
+++ b/ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     DENM TP functions
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 module ItsDenm_TpFunctions {
diff --git a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestCases.ttcn b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestCases.ttcn
index c2dc0768e..13539798a 100644
--- a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestCases.ttcn
+++ b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestCases.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       GeoNetworking Testcases 
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsGeoNetworking_TestCases {
diff --git a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn
index 657dc90b2..cf176f62b 100644
--- a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn
+++ b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TestControl.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       Test Control file for GeoNetworking
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsGeoNetworking_TestControl {
diff --git a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
index dd0aba6b6..5f1b39483 100644
--- a/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
+++ b/ttcn/AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       GeoNetworking TP Functions
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsGeoNetworking_TpFunctions {
diff --git a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
index 43b0a03f5..2b5db0dad 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     IVIM Testcases (TS 103 191-2 V1.2.1)
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  */
 
 module ItsIvim_TestCases {
diff --git a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
index b39f7729b..38ca19ffb 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     Test Control file for IVIM
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 module ItsIvim_TestControl {
diff --git a/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn b/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn
index 7ffed58ba..7fbe24aed 100644
--- a/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     IVIM TP functions
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
diff --git a/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn b/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn
index 551348e27..2c692fed5 100644
--- a/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapemSpatem_TestControl.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     Test Control file for MAPEM SPATEM
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 module ItsMapemSpatem_TestControl {
diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
index 98b183a59..e983bab7a 100644
--- a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     MAPEM Testcases (TS 103 191-2 V1.2.1)
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
index 448d45981..a96732a14 100644
--- a/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     MAPEM TP functions
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
index 74a33ccaf..9ae1db6a1 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     SPATEM Testcases (TS 103 191-2 V1.2.1)
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
index bd2a21d49..aaf1de7f9 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     SPATEM TP functions
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
index 63f8bf7ea..e965f87bf 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
@@ -29,18 +29,19 @@ module ItsRSUsSimulator_Pics {
     
     // ItsRSUsSimulator
     import from ItsRSUsSimulator_TypesAndValues all;
+    import from ItsRSUSimulator_PicsInitConsts all;
     
     /**
      * @desc This group describes the RSUs installed on the track
      */
     group rsuParameters {
-        
+    
         /**
          * @desc RSU #1 - RSUs A
          * @remark Zone #1
          */
         group rsu1 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -50,10 +51,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0201'O
             } // End of PICS_RSU_GN_ADDRESS_RSU1
-            
+        
             modulepar RsuParm PICS_RSU1 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU1,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU1,
                     timestamp_    := 0,
                     latitude      := 435529150,
                     longitude     := 103010520,
@@ -68,22 +69,22 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU1
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU1
             } // End of PICS_RSU1
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU1 := {};
-            
-        } // End of group rsu1
         
+        } // End of group rsu1
+    
         /**
          * @desc RSU #2 - RSUs B
          * @remark Zone #2
          */
         group rsu2 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -93,10 +94,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0202'O
             } // End of PICS_RSU_GN_ADDRESS_RSU2
-            
+        
             modulepar RsuParm PICS_RSU2 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU2,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU2,
                     timestamp_    := 0,
                     latitude      := 435512090,
                     longitude     := 103002510,
@@ -111,22 +112,22 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU2
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU2
             } // End of PICS_RSU2
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU2 := {};
-            
-        } // End of group rsu2
         
+        } // End of group rsu2
+    
         /**
          * @desc RSU #3 - RSUs C
          * @remark Zone #3
          */
         group rsu3 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -136,10 +137,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0203'O
             } // End of PICS_RSU_GN_ADDRESS_RSU3
-            
+        
             modulepar RsuParm PICS_RSU3 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU3,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU3,
                     timestamp_    := 0,
                     latitude      := 435546630,
                     longitude     := 103041900,
@@ -154,22 +155,22 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU3
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU3
             } // End of PICS_RSU3
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU3 := {};
-            
-        } // End of group rsu3
         
+        } // End of group rsu3
+    
         /**
          * @desc RSU #4 - RSUs D
          * @remark Zone #5
          */
         group rsu4 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -179,10 +180,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0204'O
             } // End of PICS_RSU_GN_ADDRESS_RSU4
-            
+        
             modulepar RsuParm PICS_RSU4 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU4,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU4,
                     timestamp_    := 0,
                     latitude      := 435582150,
                     longitude     := 103065170,
@@ -197,22 +198,22 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU4
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU4
             } // End of PICS_RSU4
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU4 := {};
-            
-        } // End of group rsu4
         
+        } // End of group rsu4
+    
         /**
          * @desc RSU #5 - RSUs E
          * @remark Zone #8
          */
         group rsu5 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -222,10 +223,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0205'O
             } // End of PICS_RSU_GN_ADDRESS_RSU5
-            
+        
             modulepar RsuParm PICS_RSU5 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU5,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU5,
                     timestamp_    := 0,
                     latitude      := 435838400,
                     longitude     := 103249780,
@@ -240,22 +241,22 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU5
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU5
             } // End of PICS_RSU5
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU5 := {};
-            
-        } // End of group rsu5
         
+        } // End of group rsu5
+    
         /**
          * @desc RSU #6 - RSUs F
          * @remark Zone #8
          */
         group rsu6 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -265,10 +266,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0206'O
             } // End of PICS_RSU_GN_ADDRESS_RSU6
-            
+        
             modulepar RsuParm PICS_RSU6 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU6,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU6,
                     timestamp_    := 0,
                     latitude      := 435923480,
                     longitude     := 103375540,
@@ -283,21 +284,21 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU6
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU6
             } // End of PICS_RSU6
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU6 := {};
-            
-        } // End of group rsu6
         
+        } // End of group rsu6
+    
         /**
          * @desc RSU #7
          */
         group rsu7 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -307,10 +308,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0207'O
             } // End of PICS_RSU_GN_ADDRESS_RSU7
-            
+        
             modulepar RsuParm PICS_RSU7 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU7,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU7,
                     timestamp_    := 0,
                     latitude      := 435550580,
                     longitude     := 103032980,
@@ -325,21 +326,21 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU7
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU7
             } // End of PICS_RSU7
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU7 := {};
-            
-        } // End of group rsu7
         
+        } // End of group rsu7
+    
         /**
          * @desc RSU #8
          */
         group rsu8 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -349,10 +350,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode    := 33,
                 mid                   := '001C6B0D0208'O
             } // End of PICS_RSU_GN_ADDRESS_RSU8
-            
+        
             modulepar RsuParm PICS_RSU8 := {
                 longPosVector := {
-                    gnAddr        := PICS_RSU_GN_ADDRESS_RSU8,
+                    gnAddr        := c_PICS_RSU_GN_ADDRESS_RSU8,
                     timestamp_    := 0,
                     latitude      := 435546630,
                     longitude     := 103041900,
@@ -367,66 +368,68 @@ module ItsRSUsSimulator_Pics {
                 geoParms := {
                     radius := 5000
                 },
-                pathHistory := PICS_RSU_PATH_HISTORY_RSU8
+                pathHistory := c_PICS_RSU_PATH_HISTORY_RSU8
             } // End of PICS_RSU8
-            
+        
             /**
              * @desc Path history to approch the RSU
              */
             modulepar PathHistory PICS_RSU_PATH_HISTORY_RSU8 := {};
-            
+        
         } // End of group rsu8
-                
+            
         modulepar RsuParmList PICS_RSU_PARAMS := {
-            PICS_RSU1,
-            PICS_RSU2,
-            PICS_RSU3,
-            PICS_RSU4,
-            PICS_RSU5,
-            PICS_RSU6,
-            PICS_RSU7,
-            PICS_RSU8
+            c_PICS_RSU1,
+            c_PICS_RSU2,
+            c_PICS_RSU3,
+            c_PICS_RSU4,
+            c_PICS_RSU5,
+            c_PICS_RSU6,
+            c_PICS_RSU7,
+            c_PICS_RSU8
         } // End of PICS_RSU_PARAMS
-        
-    } // End of group rsuParameters 
     
+    } // End of group rsuParameters 
+
     /**
      * @desc This group describes the BEACON common settings for the RSUs CAM message broadcast
      */
     group beaconParams {
-        
+    
         /**
          * @desc Common settings
          */
         group beaconCommonSettings {
-            
+        
             modulepar UInt32 PICS_BEACON_ITS_AID                 := 141;
-            
-        } // End of group beaconCommonSettings
         
-    } // End of group beaconParams
+        } // End of group beaconCommonSettings
     
+    } // End of group beaconParams
+
     /**
      * @desc This group describes the CAM common settings for the RSUs CAM message broadcast
      */
     group camParams {
-        
+    
         /**
          * @desc Common settings
          */
         group camCommonSettings {
-            
+        
             modulepar BtpPortId PICS_CAM_BTP_DESTINATION_PORT := 2001;
-            
+        
             modulepar BtpPortId PICS_CAM_BTP_SOURCE_PORT      := 0;
-            
+        
             modulepar UInt32 PICS_CAM_ITS_AID                 := 36;
-            
-        } // End of group camCommonSettings
         
+        } // End of group camCommonSettings
+    
         group camUseCase6 {
+        
+            group camUseCase6VehicleDescription {
             
-            group camUseCase6VehicleDescription  {
+                
                 
                 modulepar integer SIMULTANEOUS_VEHICLE_NUM        := 10;
                 
@@ -463,9 +466,9 @@ module ItsRSUsSimulator_Pics {
                 } // End of group camUseCase6VehicleTemplateDescription 
                 
             } // End of group camUseCase6VehicleDescription 
-            
+        
             group camUseCase6SyncLocation {
-                
+            
                 /**
                  * @desc Coordinates of the collision point
                  */
@@ -474,7 +477,7 @@ module ItsRSUsSimulator_Pics {
                     longitude                                     := 103000170,
                     elevation                                     := '0000'O
                 } // End of PICS_UC6_COLLISION_POINT
-                
+            
                 /**
                  * @desc Coordinates of the collision point
                  */
@@ -497,7 +500,7 @@ module ItsRSUsSimulator_Pics {
                         longitude                                     := 103011400
                     }
                 } // End of PICS_UC6_CAM_DETECTION_AREA_Z1
-                
+            
                 /**
                  * @desc Vehicle detection area
                  */
@@ -519,11 +522,11 @@ module ItsRSUsSimulator_Pics {
                 };
                 
             } // End of group camUseCase6SyncLocation 
-            
-        } // End of group camUseCase6
         
+        } // End of group camUseCase6
+    
         group camUseCase7 {
-            
+        
             /**
              * @desc RSU GN address
              */
@@ -533,10 +536,10 @@ module ItsRSUsSimulator_Pics {
                 stationCountryCode                          := 39,
                 mid                                         := '001C6B0DEEEE'O
             } // End of PICS_UC7_GN_ADDRESS
-            
+        
             modulepar RsuParm PICS_UC7_LPV := {
                 longPosVector := {
-                    gnAddr                                  := PICS_UC7_GN_ADDRESS,
+                    gnAddr                                  := c_PICS_UC7_GN_ADDRESS,
                     timestamp_                              := 0,
                     latitude                                := 435582150,
                     longitude                               := 103065170,
@@ -553,7 +556,7 @@ module ItsRSUsSimulator_Pics {
                 },
                 pathHistory                                 := {}
             } // End of PICS_UC7_LPV
-            
+        
             modulepar ReferencePosition PICS_UC7_COLLISION_POINT := {
                 latitude                                    := 435582150,
                 longitude                                   := 103065170,
@@ -567,11 +570,11 @@ module ItsRSUsSimulator_Pics {
                     altitudeConfidence := alt_000_01
                 }
             } // End of PICS_UC7_COLLISION_POINT
-            
-        } // End of group camUseCase7
         
+        } // End of group camUseCase7
+    
         group camUseCase9 {
-            
+        
             modulepar ProtectedCommunicationZone PICS_UC9_PCZ_1 := {
                 protectedZoneType        := cenDsrcTolling,
                 expiryTime               := omit,
@@ -580,78 +583,78 @@ module ItsRSUsSimulator_Pics {
                 protectedZoneRadius      := 100,
                 protectedZoneID          := 1
             } // End of PICS_UC9_PCZ_1
-            
+        
             modulepar ProtectedCommunicationZonesRSU PICS_UC9_PCZ := {
                 PICS_UC9_PCZ_1
             } // End of PICS_UC9_PCZ
-            
-        } // End of group camUseCase9
         
-    } // End of group camParams 
+        } // End of group camUseCase9
     
+    } // End of group camParams 
+
     /**
      * @desc This group describes the DENM common settings for the each use cases and for each RSU.
      */
     group denmEvents {
-        
+    
         /**
          * @desc Common settings
          */
         group denmCommonSettings {
-            
+        
             modulepar BtpPortId PICS_DENM_BTP_DESTINATION_PORT := 2002;
-            
+        
             modulepar BtpPortId PICS_DENM_BTP_SOURCE_PORT      := 0;
-            
+        
             modulepar UInt32 PICS_DENM_ITS_AID                 := 37;
-            
+        
             modulepar PosConfidenceEllipse PICS_DENM_POSITION_CONFIDENCE_ELLIPSE := {
                 semiMajorConfidence   := 100,
                 semiMinorConfidence   := 100,
                 semiMajorOrientation  := 0
             } // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE
-            
+        
             modulepar Altitude PICS_DENM_ALTITUDE := {
                 altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
                 altitudeConfidence := alt_000_01
             } // End of PICS_DENM_ALTITUDE
-            
+        
             /**
              * @desc DENM repetition interval, in ms
              */
             modulepar TransmissionInterval PICS_DENM_REPETITION_INTERVAL := 1000;
-            
+        
             /**
              * @desc DENM RelevanceDistance
              */
             modulepar RelevanceDistance PICS_DENM_RELEVANCE_DISTANCE := lessThan200m;
-            
+        
             /**
              * @desc DENM ValidityDuration
              */
             modulepar ValidityDuration PICS_DENM_VALIDITY_DURATION := 90 * 60; // 90 minutes
-            
+        
             /**
              * @desc DENM RelevanceTrafficDirection
              */
             modulepar RelevanceTrafficDirection PICS_DENM_RELEVANCE_TRAFFIC_DIRECTION := upstreamTraffic;
-            
-        } // End of group denmCommonSettings
         
+        } // End of group denmCommonSettings
+    
         /**
          * @desc Use case #1: Z1-D1-SL/Speed limit
          */
         group denmUseCase1 {
-            
+        
             /**
              * @desc Use case #1: Z1-D1-EP/Event position
              */
             group denmZone1 {
-                
+            
                 modulepar SpeedLimit PICS_SPEED_LIMIT := 30;
-                
+            
                 group denmZone1_D1 {
-                    
+                
                     /**
                      * @desc Z1-D1-EP/POS0
                      */
@@ -660,17 +663,17 @@ module ItsRSUsSimulator_Pics {
                         deltaLongitude                      := 4067,
                         deltaAltitude                       := 0
                     }; // End of PICS_Z1_D1_POS0
-                    
+                
                     /**
                      * @desc Z1-D1-EP/POS1
                      */
                     modulepar ReferencePosition PICS_Z1_D1_EP := {
                         latitude                                    := 435525352,                               // Z1-D1-EP/latitude
                         longitude                                   := 103003415,                               // Z1-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z1_D1_EP
-                    
+                
                     /**
                      * @desc Z1-D1-EP/EventHistory1
                      */
@@ -694,7 +697,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z1_D1_Hx
-                    
+                
                     /**
                      * @desc Z1-D1-Traces/Trace1
                      */
@@ -742,12 +745,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z1_D1_Tx
-                    
+                
                     modulepar DenmParm PICS_Z1_D1 := {
-                        eventPosition                               := PICS_Z1_D1_EP,
+                        eventPosition                               := c_PICS_Z1_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z1_D1_Hx,
-                        traces                                      := PICS_Z1_D1_Tx,
+                        eventHistory                                := c_PICS_Z1_D1_Hx,
+                        traces                                      := c_PICS_Z1_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -755,29 +758,29 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z1_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z1_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z1_D1
-                    
-                } // End of group denmZone1_D1
                 
+                } // End of group denmZone1_D1
+            
                 group denmZone1_D2 {
-                    
+                
                     /**
                      * @desc Z1-D2-EP/POS2
                      */
                     modulepar ReferencePosition PICS_Z1_D2_EP := {
                         latitude                                    := 435519107,                               // Z1-D2-EP/latitude
                         longitude                                   := 102993930,                               // Z1-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z1_D2_EP
-                    
+                
                     /**
                      * @desc Z1-D2-EP/EventHistory2
                      */
@@ -801,7 +804,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z1_D2_Hx
-                    
+                
                     /**
                      * @desc Z1-D2-Traces/Trace2
                      */
@@ -849,12 +852,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z1_D2_Tx
-                    
+                
                     modulepar DenmParm PICS_Z1_D2 := {
-                        eventPosition                               := PICS_Z1_D2_EP,
+                        eventPosition                               := c_PICS_Z1_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z1_D2_Hx,
-                        traces                                      := PICS_Z1_D2_Tx,
+                        eventHistory                                := c_PICS_Z1_D2_Hx,
+                        traces                                      := c_PICS_Z1_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -862,30 +865,30 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
-                        
-                    } // End of PICS_Z1_D2
                     
-                } // End of group denmZone1_D2
+                    } // End of PICS_Z1_D2
                 
+                } // End of group denmZone1_D2
+            
                 group denmZone1_D3 {
-                    
+                
                     /**
                      * @desc Z1-D3-EP/POS3
                      */
                     modulepar ReferencePosition PICS_Z1_D3_EP := {
                         latitude                                    := 435513421,                               // Z1-D3-EP/latitude
                         longitude                                   := 102986038,                               // Z1-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z1_D3_EP
-                    
+                
                     /**
                      * @desc Z1-D3-EP/EventHistory1
                      */
@@ -909,7 +912,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z1_D3_Hx
-                    
+                
                     /**
                      * @desc Z1-D3-Traces/Trace1
                      */
@@ -949,12 +952,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z1_D3_Tx
-                    
+                
                     modulepar DenmParm PICS_Z1_D3 := {
-                        eventPosition                               := PICS_Z1_D3_EP,
+                        eventPosition                               := c_PICS_Z1_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z1_D3_Hx,
-                        traces                                      := PICS_Z1_D3_Tx,
+                        eventHistory                                := c_PICS_Z1_D3_Hx,
+                        traces                                      := c_PICS_Z1_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -962,7 +965,7 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit := {
@@ -974,17 +977,17 @@ module ItsRSUsSimulator_Pics {
                             referenceDenms                          := {
                             }
                         }
-                        
-                    } // End of PICS_Z1_D3
                     
-                } // End of denmZone1_D3
+                    } // End of PICS_Z1_D3
                 
-            } // End of group denmZone1 
+                } // End of denmZone1_D3
             
+            } // End of group denmZone1 
+        
             group denmZone2 {
-                
+            
                 group denmZone2_D1 {
-                    
+                
                     /**
                      * @desc Z2-D1-EP/POS0
                      */
@@ -993,17 +996,17 @@ module ItsRSUsSimulator_Pics {
                         deltaLongitude                      := -6542,
                         deltaAltitude                       := 0
                     }; // End of PICS_Z2_D1_POS0
-                    
+                
                     /**
                      * @desc Z2-D1-EP/POS1
                      */
                     modulepar ReferencePosition PICS_Z2_D1_EP := {
                         latitude                                    := 435512286,                               // Z2-D1-EP/latitude
                         longitude                                   := 102999675,                               // Z2-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z2_D1_EP
-                    
+                
                     /**
                      * @desc Z2-D1-EP/EventHistory1
                      */
@@ -1027,7 +1030,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z2_D1_Hx
-                    
+                
                     /**
                      * @desc Z2-D1-Traces/Trace1
                      */
@@ -1075,12 +1078,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z2_D1_Tx
-                    
+                
                     modulepar DenmParm PICS_Z2_D1 := {
-                        eventPosition                               := PICS_Z2_D1_EP,
+                        eventPosition                               := c_PICS_Z2_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z2_D1_Hx,
-                        traces                                      := PICS_Z2_D1_Tx,
+                        eventHistory                                := c_PICS_Z2_D1_Hx,
+                        traces                                      := c_PICS_Z2_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1088,29 +1091,29 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z2_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z2_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z2_D1
-                    
-                } // End of group denmZone2_D1
                 
+                } // End of group denmZone2_D1
+            
                 group denmZone2_D2 {
-                    
+                
                     /**
                      * @desc Z2-D2-EP/POS2
                      */
                     modulepar ReferencePosition PICS_Z2_D2_EP := {
                         latitude                                    := 435513581,                               // Z2-D2-EP/latitude
                         longitude                                   := 103012798,                               // Z2-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z2_D2_EP
-                    
+                
                     /**
                      * @desc Z2-D2-EP/EventHistory2
                      */
@@ -1134,7 +1137,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z2_D2_Hx
-                    
+                
                     /**
                      * @desc Z2-D2-Traces/Trace2
                      */
@@ -1182,12 +1185,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z2_D2_Tx
-                    
+                
                     modulepar DenmParm PICS_Z2_D2 := {
-                        eventPosition                               := PICS_Z2_D2_EP,
+                        eventPosition                               := c_PICS_Z2_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z2_D2_Hx,
-                        traces                                      := PICS_Z2_D2_Tx,
+                        eventHistory                                := c_PICS_Z2_D2_Hx,
+                        traces                                      := c_PICS_Z2_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1195,30 +1198,30 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
-                        
-                    } // End of PICS_Z2_D2
                     
-                } // End of group denmZone2_D2
+                    } // End of PICS_Z2_D2
                 
+                } // End of group denmZone2_D2
+            
                 group denmZone2_D3 {
-                    
+                
                     /**
                      * @desc Z2-D3-EP/POS3
                      */
                     modulepar ReferencePosition PICS_Z2_D3_EP := {
                         latitude                                    := 435521014,                               // Z2-D3-EP/latitude
                         longitude                                   := 103020483,                               // Z2-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z2_D3_EP
-                    
+                
                     /**
                      * @desc Z2-D3-EP/EventHistory1
                      */
@@ -1242,7 +1245,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z2_D3_Hx
-                    
+                
                     /**
                      * @desc Z2-D3-Traces/Trace1
                      */
@@ -1282,12 +1285,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z2_D3_Tx
-                    
+                
                     modulepar DenmParm PICS_Z2_D3 := {
-                        eventPosition                               := PICS_Z2_D3_EP,
+                        eventPosition                               := c_PICS_Z2_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z2_D3_Hx,
-                        traces                                      := PICS_Z2_D3_Tx,
+                        eventHistory                                := c_PICS_Z2_D3_Hx,
+                        traces                                      := c_PICS_Z2_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1295,7 +1298,7 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
@@ -1303,15 +1306,15 @@ module ItsRSUsSimulator_Pics {
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z2_D3
-                    
-                } // group denmZone2_D3
                 
-            } // End of group denmZone2
+                } // group denmZone2_D3
             
+            } // End of group denmZone2
+        
             group denmZone3 {
-                
+            
                 group denmZone3_D1 {
-                        
+                    
                     /**
                      * @desc Z3-D1-EP/POS0
                      */
@@ -1320,17 +1323,17 @@ module ItsRSUsSimulator_Pics {
                         deltaLongitude                      := -5236,
                         deltaAltitude                       := 0
                     }; // End of PICS_Z3_D1_POS0
-                    
+                
                     /**
                      * @desc Z3-D1-EP/POS1
                      */
                     modulepar ReferencePosition PICS_Z3_D1_EP := {
                         latitude                                    := 435537393,                               // Z3-D1-EP/latitude
                         longitude                                   := 103003415,                               // Z3-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z3_D1_EP
-                        
+                    
                     /**
                      * @desc Z3-D1-EP/EventHistory1
                      */
@@ -1354,7 +1357,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z3_D1_Hx
-                        
+                    
                     /**
                      * @desc Z3-D1-Traces/Trace1
                      */
@@ -1402,12 +1405,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z3_D1_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z3_D1 := {
-                        eventPosition                               := PICS_Z3_D1_EP,
+                        eventPosition                               := c_PICS_Z3_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z3_D1_Hx,
-                        traces                                      := PICS_Z3_D1_Tx,
+                        eventHistory                                := c_PICS_Z3_D1_Hx,
+                        traces                                      := c_PICS_Z3_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1415,29 +1418,29 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z3_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z3_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z3_D1
-                        
-                } // End of group denmZone3_D1
                     
+                } // End of group denmZone3_D1
+                
                 group denmZone3_D2 {
-                        
+                    
                     /**
                      * @desc Z3-D2-EP/POS2
                      */
                     modulepar ReferencePosition PICS_Z3_D2_EP := {
                         latitude                                    := 435543599,                               // Z3-D2-EP/latitude
                         longitude                                   := 103041247,                               // Z3-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z3_D2_EP
-                        
+                    
                     /**
                      * @desc Z3-D2-EP/EventHistory2
                      */
@@ -1461,7 +1464,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z3_D2_Hx
-                        
+                    
                     /**
                      * @desc Z3-D2-Traces/Trace2
                      */
@@ -1509,12 +1512,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z3_D2_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z3_D2 := {
-                        eventPosition                               := PICS_Z3_D2_EP,
+                        eventPosition                               := c_PICS_Z3_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z3_D2_Hx,
-                        traces                                      := PICS_Z3_D2_Tx,
+                        eventHistory                                := c_PICS_Z3_D2_Hx,
+                        traces                                      := c_PICS_Z3_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1522,30 +1525,30 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
-                            
-                    } // End of PICS_Z3_D2
                         
-                } // End of group denmZone3_D2
+                    } // End of PICS_Z3_D2
                     
+                } // End of group denmZone3_D2
+                
                 group denmZone3_D3 {
-                        
+                    
                     /**
                      * @desc Z3-D3-EP/POS3
                      */
                     modulepar ReferencePosition PICS_Z3_D3_EP := {
                         latitude                                    := 435550184,                               // Z3-D3-EP/latitude
                         longitude                                   := 103037351,                               // Z3-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z3_D3_EP
-                        
+                    
                     /**
                      * @desc Z3-D3-EP/EventHistory1
                      */
@@ -1569,7 +1572,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z3_D3_Hx
-                        
+                    
                     /**
                      * @desc Z3-D3-Traces/Trace1
                      */
@@ -1609,12 +1612,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z3_D3_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z3_D3 := {
-                        eventPosition                               := PICS_Z3_D3_EP,
+                        eventPosition                               := c_PICS_Z3_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z3_D3_Hx,
-                        traces                                      := PICS_Z3_D3_Tx,
+                        eventHistory                                := c_PICS_Z3_D3_Hx,
+                        traces                                      := c_PICS_Z3_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1622,7 +1625,7 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
@@ -1630,15 +1633,15 @@ module ItsRSUsSimulator_Pics {
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z3_D3
-                        
+                    
                 } // group denmZone3_D3
-                
-            } // group denmZone3
             
+            } // group denmZone3
+        
             group denmZone4 {
-                
+            
                 group denmZone4_D1 {
-                        
+                    
                     /**
                      * @desc Z4-D1-EP/POS0
                      */
@@ -1647,17 +1650,17 @@ module ItsRSUsSimulator_Pics {
                         deltaLongitude                      := -4184,
                         deltaAltitude                       := 0
                     }; // End of PICS_Z4_D1_POS0
-                    
+                
                     /**
                      * @desc Z4-D1-EP/POS1
                      */
                     modulepar ReferencePosition PICS_Z4_D1_EP := {
                         latitude                                    := 435562873,                               // Z4-D1-EP/latitude
                         longitude                                   := 103041679,                               // Z4-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z4_D1_EP
-                        
+                    
                     /**
                      * @desc Z4-D1-EP/EventHistory1
                      */
@@ -1681,7 +1684,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z4_D1_Hx
-                        
+                    
                     /**
                      * @desc Z4-D1-Traces/Trace1
                      */
@@ -1729,12 +1732,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z4_D1_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z4_D1 := {
-                        eventPosition                               := PICS_Z4_D1_EP,
+                        eventPosition                               := c_PICS_Z4_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z4_D1_Hx,
-                        traces                                      := PICS_Z4_D1_Tx,
+                        eventHistory                                := c_PICS_Z4_D1_Hx,
+                        traces                                      := c_PICS_Z4_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1742,29 +1745,29 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z4_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z4_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z4_D1
-                        
-                } // End of group denmZone4_D1
                     
+                } // End of group denmZone4_D1
+                
                 group denmZone4_D2 {
-                        
+                    
                     /**
                      * @desc Z4-D2-EP/POS2
                      */
                     modulepar ReferencePosition PICS_Z4_D2_EP := {
                         latitude                                    := 435567174,                               // Z4-D2-EP/latitude
                         longitude                                   := 103052073,                               // Z4-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z4_D2_EP
-                        
+                    
                     /**
                      * @desc Z4-D2-EP/EventHistory2
                      */
@@ -1788,7 +1791,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z4_D2_Hx
-                        
+                    
                     /**
                      * @desc Z4-D2-Traces/Trace2
                      */
@@ -1836,12 +1839,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z4_D2_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z4_D2 := {
-                        eventPosition                               := PICS_Z4_D2_EP,
+                        eventPosition                               := c_PICS_Z4_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z4_D2_Hx,
-                        traces                                      := PICS_Z4_D2_Tx,
+                        eventHistory                                := c_PICS_Z4_D2_Hx,
+                        traces                                      := c_PICS_Z4_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1849,30 +1852,30 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
-                            
-                    } // End of PICS_Z4_D2
                         
-                } // End of group denmZone4_D2
+                    } // End of PICS_Z4_D2
                     
+                } // End of group denmZone4_D2
+                
                 group denmZone4_D3 {
-                        
+                    
                     /**
                      * @desc Z4-D3-EP/POS3
                      */
                     modulepar ReferencePosition PICS_Z4_D3_EP := {
                         latitude                                    := 435573552,                               // Z4-D3-EP/latitude
                         longitude                                   := 103060751,                               // Z4-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z4_D3_EP
-                        
+                    
                     /**
                      * @desc Z4-D3-EP/EventHistory1
                      */
@@ -1896,7 +1899,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z4_D3_Hx
-                        
+                    
                     /**
                      * @desc Z4-D3-Traces/Trace1
                      */
@@ -1936,12 +1939,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z4_D3_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z4_D3 := {
-                        eventPosition                               := PICS_Z4_D3_EP,
+                        eventPosition                               := c_PICS_Z4_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z4_D3_Hx,
-                        traces                                      := PICS_Z4_D3_Tx,
+                        eventHistory                                := c_PICS_Z4_D3_Hx,
+                        traces                                      := c_PICS_Z4_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -1949,7 +1952,7 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
@@ -1957,15 +1960,15 @@ module ItsRSUsSimulator_Pics {
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z4_D3
-                        
+                    
                 } // group denmZone4_D3
-                
-            } // group denmZone4
             
+            } // group denmZone4
+        
             group denmZone5 {
-                
+            
                 group denmZone5_D1 {
-                        
+                    
                     /**
                      * @desc Z5-D1-EP/POS0
                      */
@@ -1974,17 +1977,17 @@ module ItsRSUsSimulator_Pics {
                         deltaLongitude                      := 4085,
                         deltaAltitude                       := 0
                     }; // End of PICS_Z5_D1_POS0
-                    
+                
                     /**
                      * @desc Z5-D1-EP/POS1
                      */
                     modulepar ReferencePosition PICS_Z5_D1_EP := {
                         latitude                                    := 435574984,                               // Z5-D1-EP/latitude
                         longitude                                   := 103061238,                               // Z5-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z5_D1_EP
-                        
+                    
                     /**
                      * @desc Z5-D1-EP/EventHistory1
                      */
@@ -2008,7 +2011,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z5_D1_Hx
-                        
+                    
                     /**
                      * @desc Z5-D1-Traces/Trace1
                      */
@@ -2056,12 +2059,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z5_D1_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z5_D1 := {
-                        eventPosition                               := PICS_Z5_D1_EP,
+                        eventPosition                               := c_PICS_Z5_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z5_D1_Hx,
-                        traces                                      := PICS_Z5_D1_Tx,
+                        eventHistory                                := c_PICS_Z5_D1_Hx,
+                        traces                                      := c_PICS_Z5_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -2069,29 +2072,29 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z5_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z5_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z5_D1
-                        
-                } // End of group denmZone5_D1
                     
+                } // End of group denmZone5_D1
+                
                 group denmZone5_D2 {
-                        
+                    
                     /**
                      * @desc Z5-D2-EP/POS2
                      */
                     modulepar ReferencePosition PICS_Z5_D2_EP := {
                         latitude                                    := 435568551,                               // Z5-D2-EP/latitude
                         longitude                                   := 103052438,                               // Z5-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z5_D2_EP
-                        
+                    
                     /**
                      * @desc Z5-D2-EP/EventHistory2
                      */
@@ -2115,7 +2118,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z5_D2_Hx
-                        
+                    
                     /**
                      * @desc Z5-D2-Traces/Trace2
                      */
@@ -2163,12 +2166,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z5_D2_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z5_D2 := {
-                        eventPosition                               := PICS_Z5_D2_EP,
+                        eventPosition                               := c_PICS_Z5_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z5_D2_Hx,
-                        traces                                      := PICS_Z5_D2_Tx,
+                        eventHistory                                := c_PICS_Z5_D2_Hx,
+                        traces                                      := c_PICS_Z5_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -2176,30 +2179,30 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
-                            
+                        
                     } // End of PICS_Z5_D2
-                    
+                
                 } // End of group denmZone5_D2
-                    
+                
                 group denmZone5_D3 {
-                        
+                    
                     /**
                      * @desc Z5-D3-EP/POS3
                      */
                     modulepar ReferencePosition PICS_Z5_D3_EP := {
                         latitude                                    := 435565175,                               // Z5-D3-EP/latitude
                         longitude                                   := 103041136,                               // Z5-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z5_D3_EP
-                        
+                    
                     /**
                      * @desc Z5-D3-EP/EventHistory1
                      */
@@ -2223,7 +2226,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z5_D3_Hx
-                        
+                    
                     /**
                      * @desc Z5-D3-Traces/Trace1
                      */
@@ -2263,12 +2266,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z5_D3_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z5_D3 := {
-                        eventPosition                               := PICS_Z5_D3_EP,
+                        eventPosition                               := c_PICS_Z5_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z5_D3_Hx,
-                        traces                                      := PICS_Z5_D3_Tx,
+                        eventHistory                                := c_PICS_Z5_D3_Hx,
+                        traces                                      := c_PICS_Z5_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -2276,7 +2279,7 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
@@ -2284,15 +2287,15 @@ module ItsRSUsSimulator_Pics {
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z5_D3
-                        
+                    
                 } // group denmZone5_D3
-                
-            } // group denmZone5
             
+            } // group denmZone5
+        
             group denmZone6 {
-                
+            
                 group denmZone6_D1 {
-                    
+                
                     /**
                      * @desc Z6-D1-EP/POS0
                      */
@@ -2301,17 +2304,17 @@ module ItsRSUsSimulator_Pics {
                         deltaLongitude                      := -3929,
                         deltaAltitude                       := 0
                     }; // End of PICS_Z6_D1_POS0
-                    
+                
                     /**
                      * @desc Z6-D1-EP/POS1
                      */
                     modulepar ReferencePosition PICS_Z6_D1_EP := {
                         latitude                                    := 435549548,                               // Z6-D1-EP/latitude
                         longitude                                   := 103036609,                               // Z6-D1-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z6_D1_EP
-                    
+                
                     /**
                      * @desc Z6-D1-EP/EventHistory1
                      */
@@ -2335,7 +2338,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z6_D1_Hx
-                        
+                    
                     /**
                      * @desc Z6-D1-Traces/Trace1
                      */
@@ -2383,12 +2386,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z6_D1_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z6_D1 := {
-                        eventPosition                               := PICS_Z6_D1_EP,
+                        eventPosition                               := c_PICS_Z6_D1_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z6_D1_Hx,
-                        traces                                      := PICS_Z6_D1_Tx,
+                        eventHistory                                := c_PICS_Z6_D1_Hx,
+                        traces                                      := c_PICS_Z6_D1_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -2396,29 +2399,29 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0001'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
-                            startingPointSpeedLimit                 := PICS_Z6_D1_POS0,
+                            startingPointSpeedLimit                 := c_PICS_Z6_D1_POS0,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z6_D1
-                        
-                } // End of group denmZone6_D1
                     
+                } // End of group denmZone6_D1
+                
                 group denmZone6_D2 {
-                        
+                    
                     /**
                      * @desc Z6-D2-EP/POS2
                      */
                     modulepar ReferencePosition PICS_Z6_D2_EP := {
                         latitude                                    := 435542600,                               // Z6-D2-EP/latitude
                         longitude                                   := 103032647,                               // Z6-D2-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     }; // End of PICS_Z6_D2_EP
-                        
+                    
                     /**
                      * @desc Z6-D2-EP/EventHistory2
                      */
@@ -2442,7 +2445,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z6_D2_Hx
-                        
+                    
                     /**
                      * @desc Z6-D2-Traces/Trace2
                      */
@@ -2490,12 +2493,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z6_D2_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z6_D2 := {
-                        eventPosition                               := PICS_Z6_D2_EP,
+                        eventPosition                               := c_PICS_Z6_D2_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z6_D2_Hx,
-                        traces                                      := PICS_Z6_D2_Tx,
+                        eventHistory                                := c_PICS_Z6_D2_Hx,
+                        traces                                      := c_PICS_Z6_D2_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -2503,30 +2506,30 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0011'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
                             trafficFlowRule                         := passToRight,
                             referenceDenms                          := omit
                         }
-                            
-                    } // End of PICS_Z6_D2
                         
-                } // End of group denmZone6_D2
+                    } // End of PICS_Z6_D2
                     
+                } // End of group denmZone6_D2
+                
                 group denmZone6_D3 {
-                        
+                    
                     /**
                      * @desc Z6-D3-EP/POS3
                      */
                     modulepar ReferencePosition PICS_Z6_D3_EP := {
                         latitude                                    := 435536760,                               // Z6-D3-EP/latitude
                         longitude                                   := 103024345,                               // Z6-D3-EP/longitude
-                        positionConfidenceEllipse                   := PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
-                        altitude                                    := PICS_DENM_ALTITUDE
+                        positionConfidenceEllipse                   := c_PICS_DENM_POSITION_CONFIDENCE_ELLIPSE,
+                        altitude                                    := c_PICS_DENM_ALTITUDE
                     } // End of PICS_Z6_D3_EP
-                        
+                    
                     /**
                      * @desc Z6-D3-EP/EventHistory1
                      */
@@ -2550,7 +2553,7 @@ module ItsRSUsSimulator_Pics {
                             informationQuality                      := 0
                         }
                     }; // End of PICS_Z6_D3_Hx
-                        
+                    
                     /**
                      * @desc Z6-D3-Traces/Trace1
                      */
@@ -2590,12 +2593,12 @@ module ItsRSUsSimulator_Pics {
                             }
                         }
                     }; // End of PICS_Z6_D3_Tx
-                        
+                    
                     modulepar DenmParm PICS_Z6_D3 := {
-                        eventPosition                               := PICS_Z6_D3_EP,
+                        eventPosition                               := c_PICS_Z6_D3_EP,
                         causeCodeType                               := CauseCodeType_roadworks_,
-                        eventHistory                                := PICS_Z6_D3_Hx,
-                        traces                                      := PICS_Z6_D3_Tx,
+                        eventHistory                                := c_PICS_Z6_D3_Hx,
+                        traces                                      := c_PICS_Z6_D3_Tx,
                         roadWorksContainerExtended := {
                             lightBarSirenInUse                      := omit,
                             closedLanes := {
@@ -2603,7 +2606,7 @@ module ItsRSUsSimulator_Pics {
                                 drivingLaneStatus                   := '0100'B
                             },
                             restriction                             := omit,
-                            speedLimit                              := PICS_SPEED_LIMIT,
+                            speedLimit                              := c_PICS_SPEED_LIMIT,
                             incidentIndication                      := omit,
                             recommendedPath                         := omit,
                             startingPointSpeedLimit                 := omit,
@@ -2611,80 +2614,80 @@ module ItsRSUsSimulator_Pics {
                             referenceDenms                          := omit
                         }
                     } // End of PICS_Z6_D3
-                    
-                } // group denmZone6_D3
                 
-            } // group denmZone6
+                } // group denmZone6_D3
             
+            } // group denmZone6
+        
             modulepar DenmEventsParmsUseCase PICS_DENM_PARMS_UC1_RWW := {
                 { // Zone 1
-                    PICS_Z1_D1,
-                    PICS_Z1_D2,
-                    PICS_Z1_D3
+                    c_PICS_Z1_D1,
+                    c_PICS_Z1_D2,
+                    c_PICS_Z1_D3
                 },
                 { // Zone 2
-                    PICS_Z2_D1,
-                    PICS_Z2_D2,
-                    PICS_Z2_D3
+                    c_PICS_Z2_D1,
+                    c_PICS_Z2_D2,
+                    c_PICS_Z2_D3
                 },
                 { // Zone 3
-                    PICS_Z3_D1,
-                    PICS_Z3_D2,
-                    PICS_Z3_D3
+                    c_PICS_Z3_D1,
+                    c_PICS_Z3_D2,
+                    c_PICS_Z3_D3
                 },
                 { // Zone 4
-                    PICS_Z4_D1,
-                    PICS_Z4_D2,
-                    PICS_Z4_D3
+                    c_PICS_Z4_D1,
+                    c_PICS_Z4_D2,
+                    c_PICS_Z4_D3
                 },
                 { // Zone 5
-                    PICS_Z5_D1,
-                    PICS_Z5_D2,
-                    PICS_Z5_D3
+                    c_PICS_Z5_D1,
+                    c_PICS_Z5_D2,
+                    c_PICS_Z5_D3
                 },
                 { // Zone 6
-                    PICS_Z6_D1,
-                    PICS_Z6_D2,
-                    PICS_Z6_D3
+                    c_PICS_Z6_D1,
+                    c_PICS_Z6_D2,
+                    c_PICS_Z6_D3
                 }
             } // End of PICS_DENM_PARMS_UC1_RWW
-            
-        } // End of group denmUseCase1 
         
+        } // End of group denmUseCase1 
+    
         modulepar DenmEventsParmsUseCaseRsu PICS_DENM_EVENTS_RSU := {
-            PICS_DENM_PARMS_UC1_RWW,
-            PICS_DENM_PARMS_UC1_RWW,
-            PICS_DENM_PARMS_UC1_RWW
+            c_PICS_DENM_PARMS_UC1_RWW,
+            c_PICS_DENM_PARMS_UC1_RWW,
+            c_PICS_DENM_PARMS_UC1_RWW
         } // End of PICS_DENM_EVENTS_RSU
-        
-    } // End of group denmEvents 
     
+    } // End of group denmEvents 
+
     group mapemEvents {
-        
+    
         group mapemCommonParams {
-            
+        
             modulepar BtpPortId PICS_MAPEM_BTP_DESTINATION_PORT  := 2003;
-            
+        
             modulepar BtpPortId PICS_MAPEM_BTP_SOURCE_PORT       := 0;
-            
+        
             modulepar UInt32 PICS_MAPEM_ITS_AID                  := 138;
-            
-        } // End of group mapemCommonParams
         
+        } // End of group mapemCommonParams
+    
         group mapemZone1 {
-            
+        
             modulepar IntersectionReferenceID PICS_Z1_M1_SL_IDX := {
                 region                          := 3,
                 id                              := 13001
             } // End of PICS_Z1_M1_SL_IDX
-            
+        
             modulepar Position3D PICS_Z1_M1_SL_RP := {
                 lat                             := 435527493,
                 long                            := 103006446,
                 elevation                       := omit,
                 regional                        := omit
             } // End of PICS_Z1_M1_SL_RP
-            
+        
             modulepar NodeListXY PICS_Z1_M1_SL_LANE10 := {
                 nodes := {
                     {
@@ -2734,7 +2737,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z1_M1_SL_LANE10
-            
+        
             modulepar NodeListXY PICS_Z1_M1_SL_LANE20 := {
                 nodes := {
                     { 
@@ -2757,14 +2760,14 @@ module ItsRSUsSimulator_Pics {
                     } 
                 }
             } // End of PICS_Z1_M1_SL_LANE20
-            
+        
             modulepar MapemParm PICS_Z1_M1_SL := {
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z1_M1_SL",
-                        id                                  := PICS_Z1_M1_SL_IDX,
+                        id                                  := c_PICS_Z1_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z1_M1_SL_RP,
+                        refPoint                            := c_PICS_Z1_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
@@ -2782,7 +2785,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z1_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z1_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
@@ -2812,7 +2815,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z1_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z1_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
@@ -2824,23 +2827,23 @@ module ItsRSUsSimulator_Pics {
                 }, // End of field intersections
                 roadSegments := omit
             } // End of PICS_Z1_M1_SL
-            
-        } // End of group mapemZone1 
         
+        } // End of group mapemZone1 
+    
         group mapemZone2 {
-            
+        
             modulepar IntersectionReferenceID PICS_Z2_M1_SL_IDX := {
                 region                          := 3,
                 id                              := 23001
             } // End of PICS_Z2_M1_SL_IDX
-            
+        
             modulepar Position3D PICS_Z2_M1_SL_RP := {
                 lat                             := 435512756,
                 long                            := 103002535,
                 elevation                       := omit,
                 regional                        := omit
             } // End of PICS_Z2_M1_SL_RP
-            
+        
             modulepar NodeListXY PICS_Z2_M1_SL_LANE10 := {
                 nodes := {
                     {
@@ -2890,7 +2893,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z2_M1_SL_LANE10
-            
+        
             modulepar NodeListXY PICS_Z2_M1_SL_LANE20 := {
                 nodes := {
                     { 
@@ -2913,14 +2916,14 @@ module ItsRSUsSimulator_Pics {
                     } 
                 }
             } // End of PICS_Z2_M1_SL_LANE20
-            
+        
             modulepar MapemParm PICS_Z2_M1_SL := {
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z2_M1_SL",
-                        id                                  := PICS_Z2_M1_SL_IDX,
+                        id                                  := c_PICS_Z2_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z2_M1_SL_RP,
+                        refPoint                            := c_PICS_Z2_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
@@ -2938,7 +2941,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z2_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z2_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
@@ -2968,7 +2971,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z2_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z2_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
@@ -2980,23 +2983,23 @@ module ItsRSUsSimulator_Pics {
                 }, // End of field intersections
                 roadSegments := omit
             } // End of PICS_Z2_M1_SL
-            
-        } // End of group mapemZone2 
         
+        } // End of group mapemZone2 
+    
         group mapemZone3 {
-            
+        
             modulepar IntersectionReferenceID PICS_Z3_M1_SL_IDX := {
                 region                          := 3,
                 id                              := 33001
             } // End of PICS_Z3_M1_SL_IDX
-            
+        
             modulepar Position3D PICS_Z3_M1_SL_RP := {
                 lat                             := 435536609,
                 long                            := 103031286,
                 elevation                       := omit,
                 regional                        := omit
             } // End of PICS_Z3_M1_SL_RP
-            
+        
             modulepar NodeListXY PICS_Z3_M1_SL_LANE10 := {
                 nodes := {
                     {
@@ -3046,7 +3049,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z3_M1_SL_LANE10
-            
+        
             modulepar NodeListXY PICS_Z3_M1_SL_LANE20 := {
                 nodes := {
                     { 
@@ -3069,14 +3072,14 @@ module ItsRSUsSimulator_Pics {
                     } 
                 }
             } // End of PICS_Z3_M1_SL_LANE20
-            
+        
             modulepar MapemParm PICS_Z3_M1_SL := {
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z3_M1_SL",
-                        id                                  := PICS_Z3_M1_SL_IDX,
+                        id                                  := c_PICS_Z3_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z3_M1_SL_RP,
+                        refPoint                            := c_PICS_Z3_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
@@ -3094,7 +3097,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z3_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z3_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
@@ -3124,7 +3127,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z3_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z3_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
@@ -3136,23 +3139,23 @@ module ItsRSUsSimulator_Pics {
                 }, // End of field intersections
                 roadSegments := omit
             } // End of PICS_Z3_M1_SL
-            
-        } // End of group mapemZone3 
         
+        } // End of group mapemZone3 
+    
         group mapemZone4 {
-            
+        
             modulepar IntersectionReferenceID PICS_Z4_M1_SL_IDX := {
                 region                          := 3,
                 id                              := 43001
             } // End of PICS_Z4_M1_SL_IDX
-            
+        
             modulepar Position3D PICS_Z4_M1_SL_RP := {
                 lat                             := 435563484,
                 long                            := 103042973,
                 elevation                       := omit,
                 regional                        := omit
             } // End of PICS_Z4_M1_SL_RP
-            
+        
             modulepar NodeListXY PICS_Z4_M1_SL_LANE10 := {
                 nodes := {
                     {
@@ -3202,7 +3205,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z4_M1_SL_LANE10
-            
+        
             modulepar NodeListXY PICS_Z4_M1_SL_LANE20 := {
                 nodes := {
                     { 
@@ -3225,14 +3228,14 @@ module ItsRSUsSimulator_Pics {
                     } 
                 }
             } // End of PICS_Z4_M1_SL_LANE20
-            
+        
             modulepar MapemParm PICS_Z4_M1_SL := {
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z4_M1_SL",
-                        id                                  := PICS_Z4_M1_SL_IDX,
+                        id                                  := c_PICS_Z4_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z4_M1_SL_RP,
+                        refPoint                            := c_PICS_Z4_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
@@ -3250,7 +3253,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z4_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z4_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
@@ -3280,7 +3283,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z4_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z4_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
@@ -3292,23 +3295,23 @@ module ItsRSUsSimulator_Pics {
                 }, // End of field intersections
                 roadSegments := omit
             } // End of PICS_Z4_M1_SL
-            
-        } // End of group mapemZone4 
         
+        } // End of group mapemZone4 
+    
         group mapemZone5 {
-            
+        
             modulepar IntersectionReferenceID PICS_Z5_M1_SL_IDX := {
                 region                          := 3,
                 id                              := 53001
             } // End of PICS_Z5_M1_SL_IDX
-            
+        
             modulepar Position3D PICS_Z5_M1_SL_RP := {
                 lat                             := 435578537,
                 long                            := 103061555,
                 elevation                       := omit,
                 regional                        := omit
             } // End of PICS_Z5_M1_SL_RP
-            
+        
             modulepar NodeListXY PICS_Z5_M1_SL_LANE10 := {
                 nodes := {
                     {
@@ -3358,7 +3361,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z5_M1_SL_LANE10
-            
+        
             modulepar NodeListXY PICS_Z5_M1_SL_LANE20 := {
                 nodes := {
                     { 
@@ -3381,14 +3384,14 @@ module ItsRSUsSimulator_Pics {
                     } 
                 }
             } // End of PICS_Z5_M1_SL_LANE20
-            
+        
             modulepar MapemParm PICS_Z5_M1_SL := {
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z5_M1_SL",
-                        id                                  := PICS_Z5_M1_SL_IDX,
+                        id                                  := c_PICS_Z5_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z5_M1_SL_RP,
+                        refPoint                            := c_PICS_Z5_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
@@ -3406,7 +3409,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z5_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z5_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
@@ -3436,7 +3439,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z5_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z5_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
@@ -3448,23 +3451,23 @@ module ItsRSUsSimulator_Pics {
                 }, // End of field intersections
                 roadSegments := omit
             } // End of PICS_Z5_M1_SL
-            
-        } // End of group mapemZone5 
         
+        } // End of group mapemZone5 
+    
         group mapemZone6 {
-            
+        
             modulepar IntersectionReferenceID PICS_Z6_M1_SL_IDX := {
                 region                          := 3,
                 id                              := 63001
             } // End of PICS_Z6_M1_SL_IDX
-            
+        
             modulepar Position3D PICS_Z6_M1_SL_RP := {
                 lat                             := 435551186,
                 long                            := 103033248,
                 elevation                       := omit,
                 regional                        := omit
             } // End of PICS_Z6_M1_SL_RP
-            
+        
             modulepar NodeListXY PICS_Z6_M1_SL_LANE10 := {
                 nodes := {
                     {
@@ -3514,7 +3517,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z6_M1_SL_LANE10
-            
+        
             modulepar NodeListXY PICS_Z6_M1_SL_LANE20 := {
                 nodes := {
                     { 
@@ -3537,14 +3540,14 @@ module ItsRSUsSimulator_Pics {
                     } 
                 }
             } // End of PICS_Z6_M1_SL_LANE20
-            
+        
             modulepar MapemParm PICS_Z6_M1_SL := {
                 intersections := {
                     { // Start of intersection #0
                         name                                := "PICS_Z6_M1_SL",
-                        id                                  := PICS_Z6_M1_SL_IDX,
+                        id                                  := c_PICS_Z6_M1_SL_IDX,
                         revision                            := 0,
-                        refPoint                            := PICS_Z6_M1_SL_RP,
+                        refPoint                            := c_PICS_Z6_M1_SL_RP,
                         laneWidth                           := omit,
                         speedLimits                         := omit,
                         laneSet := {
@@ -3562,7 +3565,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z6_M1_SL_LANE10,
+                                nodeList                    := c_PICS_Z6_M1_SL_LANE10,
                                 connectsTo := {
                                     {
                                         connectingLane := {
@@ -3592,7 +3595,7 @@ module ItsRSUsSimulator_Pics {
                                     regional                := omit
                                 },
                                 maneuvers                   := omit,
-                                nodeList                    := PICS_Z6_M1_SL_LANE20,
+                                nodeList                    := c_PICS_Z6_M1_SL_LANE20,
                                 connectsTo                  := omit,
                                 overlays                    := omit,
                                 regional                    := omit
@@ -3604,58 +3607,58 @@ module ItsRSUsSimulator_Pics {
                 }, // End of field intersections
                 roadSegments := omit
             } // End of PICS_Z6_M1_SL
-            
-        } // End of group mapemZone6 
         
+        } // End of group mapemZone6 
+    
         modulepar MapemParmListRsu PICS_MAPEM_PARMS_RSUs := {
-            PICS_Z1_M1_SL,                 // RSU #1
-            PICS_Z2_M1_SL/*{
+            c_PICS_Z1_M1_SL,                 // RSU #1
+            c_PICS_Z2_M1_SL/*{
                 intersections := omit,
                 roadSegments  := omit
             }*/,                              // RSU #2
-            PICS_Z2_M1_SL,                  // RSU #3
-            PICS_Z5_M1_SL,                  // RSU #4
-            PICS_Z4_M1_SL,                  // RSU #5
+            c_PICS_Z2_M1_SL,                  // RSU #3
+            c_PICS_Z5_M1_SL,                  // RSU #4
+            c_PICS_Z4_M1_SL,                  // RSU #5
             {
                 intersections := omit,
                 roadSegments  := omit
             },                              // RSU #6
-            PICS_Z6_M1_SL,                  // RSU #7
-            PICS_Z3_M1_SL                   // RSU #8
+            c_PICS_Z6_M1_SL,                  // RSU #7
+            c_PICS_Z3_M1_SL                   // RSU #8
         } // End of PICS_MAPEM_PARMS_RSU
-        
-    } // End of group mapemEvents 
     
+    } // End of group mapemEvents 
+
     group spatemEvents {
-        
+    
         group spatemCommonParams {
-            
+        
             modulepar BtpPortId PICS_SPATEM_BTP_DESTINATION_PORT        := 2004;
-            
+        
             modulepar BtpPortId PICS_SPATEM_BTP_SOURCE_PORT             := 0;
-            
+        
             modulepar UInt32 PICS_SPATEM_ITS_AID                        := 137;
-            
+        
             modulepar UInt32 PICS_SPATEM_REPITITION_DURATION_STATE_10    := 10*10; // In units of 1/10th second
-            
+        
             modulepar UInt32 PICS_SPATEM_REPITITION_DURATION_STATE_20    := 20*10; // In units of 1/10th second
-            
+        
             modulepar UInt32 PICS_SPATEM_REPITITION_DURATION_STATE_30    := 30*10; // In units of 1/10th second
-            
+        
             modulepar UInt32 PICS_SPATEM_REPITITION_DURATION_STATE_40    := 40*10; // In units of 1/10th second
-            
+        
             modulepar UInt32 PICS_SPATEM_REPITITION_DURATION_STATE_50    := 50*10; // In units of 1/10th second
-            
-        } // End of group spatemCommonParams
         
+        } // End of group spatemCommonParams
+    
         group spatemZone1 {
-            
+        
             modulepar SignalGroupParm PICS_Z1_S1_SL := {
                 signalGroupID                               := 1,
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z1_M1_SL_IDX,
+                        id                                  := c_PICS_Z1_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
                         moy                                 := 0, // To be updated in real-time
@@ -3731,21 +3734,21 @@ module ItsRSUsSimulator_Pics {
                     }
                 } // End of field states
             } // End of type PICS_Z1_S1_SL
-            
+        
             modulepar SignalGroupParmList PICS_Z1_S1_SL_LIST := {
-                PICS_Z1_S1_SL
+                c_PICS_Z1_S1_SL
             } // End of type PICS_Z1_S1_SL_LIST
-            
-        } // End of group spatemZone1
         
+        } // End of group spatemZone1
+    
         group spatemZone2 {
-            
+        
             modulepar SignalGroupParm PICS_Z2_S1_SL := {
                 signalGroupID                               := 1,
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z2_M1_SL_IDX,
+                        id                                  := c_PICS_Z2_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
                         moy                                 := 0, // To be updated in real-time
@@ -3821,21 +3824,21 @@ module ItsRSUsSimulator_Pics {
                     }
                 } // End of field states
             } // End of type PICS_Z2_S1_SL
-            
+        
             modulepar SignalGroupParmList PICS_Z2_S1_SL_LIST := {
-                PICS_Z2_S1_SL
+                c_PICS_Z2_S1_SL
             } // End of type PICS_Z2_S1_SL_LIST
-            
-        } // End of group spatemZone2
         
+        } // End of group spatemZone2
+    
         group spatemZone3 {
-            
+        
             modulepar SignalGroupParm PICS_Z3_S1_SL := {
                 signalGroupID                               := 1,
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z3_M1_SL_IDX,
+                        id                                  := c_PICS_Z3_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
                         moy                                 := 0, // To be updated in real-time
@@ -3911,21 +3914,21 @@ module ItsRSUsSimulator_Pics {
                     }
                 } // End of field states
             } // End of type PICS_Z3_S1_SL
-            
+        
             modulepar SignalGroupParmList PICS_Z3_S1_SL_LIST := {
-                PICS_Z3_S1_SL
+                c_PICS_Z3_S1_SL
             } // End of type PICS_Z3_S1_SL_LIST
-            
-        } // End of group spatemZone3
         
+        } // End of group spatemZone3
+    
         group spatemZone4 {
-            
+        
             modulepar SignalGroupParm PICS_Z4_S1_SL := {
                 signalGroupID                               := 1,
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z4_M1_SL_IDX,
+                        id                                  := c_PICS_Z4_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
                         moy                                 := 0, // To be updated in real-time
@@ -4001,21 +4004,21 @@ module ItsRSUsSimulator_Pics {
                     }
                 } // End of field states
             } // End of type PICS_Z4_S1_SL
-            
+        
             modulepar SignalGroupParmList PICS_Z4_S1_SL_LIST := {
-                PICS_Z4_S1_SL
+                c_PICS_Z4_S1_SL
             } // End of type PICS_Z4_S1_SL_LIST
-            
-        } // End of group spatemZone4
         
+        } // End of group spatemZone4
+    
         group spatemZone5 {
-            
+        
             modulepar SignalGroupParm PICS_Z5_S1_SL := {
                 signalGroupID                               := 1,
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z5_M1_SL_IDX,
+                        id                                  := c_PICS_Z5_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
                         moy                                 := 0, // To be updated in real-time
@@ -4091,21 +4094,21 @@ module ItsRSUsSimulator_Pics {
                     }
                 } // End of field states
             } // End of type PICS_Z5_S1_SL
-            
+        
             modulepar SignalGroupParmList PICS_Z5_S1_SL_LIST := {
-                PICS_Z5_S1_SL
+                c_PICS_Z5_S1_SL
             } // End of type PICS_Z5_S1_SL_LIST
-            
-        } // End of group spatemZone5
         
+        } // End of group spatemZone5
+    
         group spatemZone6 {
-            
+        
             modulepar SignalGroupParm PICS_Z6_S1_SL := {
                 signalGroupID                               := 1,
                 intersections := {
                     {
                         name                                := "PICS_SPATEM_PARMS_SG_50",
-                        id                                  := PICS_Z6_M1_SL_IDX,
+                        id                                  := c_PICS_Z6_M1_SL_IDX,
                         revision                            := 0,   
                         status                              := int2bit(0, 16),
                         moy                                 := 0, // To be updated in real-time
@@ -4181,58 +4184,58 @@ module ItsRSUsSimulator_Pics {
                     }
                 } // End of field states
             } // End of type PICS_Z6_S1_SL
-            
+        
             modulepar SignalGroupParmList PICS_Z6_S1_SL_LIST := {
-                PICS_Z6_S1_SL
+                c_PICS_Z6_S1_SL
             } // End of type PICS_Z6_S1_SL_LIST
-            
-        } // End of group spatemZone6
         
+        } // End of group spatemZone6
+    
         modulepar SpatemParmRsu PICS_SPATEM_PARMS_RSUs := {
-            PICS_Z1_S1_SL_LIST,              // RSU #1
-            PICS_Z2_S1_SL_LIST/*{}*/,                              // RSU #2
-            PICS_Z2_S1_SL_LIST,              // RSU #3
-            PICS_Z5_S1_SL_LIST,              // RSU #4
-            PICS_Z4_S1_SL_LIST,              // RSU #5
+            c_PICS_Z1_S1_SL_LIST,              // RSU #1
+            c_PICS_Z2_S1_SL_LIST/*{}*/,                              // RSU #2
+            c_PICS_Z2_S1_SL_LIST,              // RSU #3
+            c_PICS_Z5_S1_SL_LIST,              // RSU #4
+            c_PICS_Z4_S1_SL_LIST,              // RSU #5
             {},                              // RSU #6
-            PICS_Z6_S1_SL_LIST,              // RSU #7
+            c_PICS_Z6_S1_SL_LIST,              // RSU #7
             {}                               // RSU #8
         } // End of PICS_SPATEM_PARMS_RSUs
-        
-    } // End of group spatemEvents
     
+    } // End of group spatemEvents
+
     group ivimEvents {
-        
+    
         group ivimCommonParams {
-            
+        
             modulepar BtpPortId PICS_IVIM_BTP_DESTINATION_PORT := 2006;
-            
+        
             modulepar BtpPortId PICS_IVIM_BTP_SOURCE_PORT      := 0;
-            
+        
             modulepar UInt32 PICS_IVIM_ITS_AID                 := 139;
-            
+        
             modulepar PosConfidenceEllipse PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE := {
                 semiMajorConfidence   := 100,
                 semiMinorConfidence   := 100,
                 semiMajorOrientation  := 0
             } // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE
-            
+        
             modulepar Altitude PICS_IVIM_ALTITUDE := {
                 altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
                 altitudeConfidence := alt_000_01
             } // End of PICS_DENM_ALTITUDE
-            
-        } // End of group ivimCommonParams
         
+        } // End of group ivimCommonParams
+    
         group ivimZone1 {
-            
+        
             modulepar ReferencePosition PICS_Z1_I1_POS1_RP := {
                 latitude                                       := 435527493,
                 longitude                                      := 103006446,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z1_I1_POS1_RP
-            
+        
             modulepar GlcPart PICS_Z1_I1_POS1_GP_1 := {
                 zoneId                                         := 1, 
                 laneNumber                                     := omit,
@@ -4268,7 +4271,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z1_I1_POS1_GP_1
-            
+        
             modulepar GlcPart PICS_Z1_I1_POS1_GP_2 := {
                 zoneId                                         := 2, 
                 laneNumber                                     := omit,
@@ -4304,7 +4307,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z1_I1_POS1_GP_2
-            
+        
             modulepar IvimParm PICS_Z1_I1_POS1 := {
                 provider := {
                     countryCode                                := '1100000001'B,
@@ -4314,13 +4317,13 @@ module ItsRSUsSimulator_Pics {
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z1_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z1_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z1_I1_POS1_GP_1,
-                                PICS_Z1_I1_POS1_GP_2
+                                c_PICS_Z1_I1_POS1_GP_1,
+                                c_PICS_Z1_I1_POS1_GP_2
                             } 
                         }
                     },
@@ -4358,7 +4361,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 57
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := {
@@ -4440,7 +4443,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 44
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := omit
@@ -4454,18 +4457,18 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z1_I1_POS1
-            
-        } // End of group ivimZone1 
         
+        } // End of group ivimZone1 
+    
         group ivimZone2 {
-            
+        
             modulepar ReferencePosition PICS_Z2_I1_POS1_RP := {
                 latitude                                       := 435512756,
                 longitude                                      := 103002535,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z2_I1_POS1_RP
-            
+        
             modulepar GlcPart PICS_Z2_I1_POS1_GP_1 := {
                 zoneId                                         := 1, 
                 laneNumber                                     := omit,
@@ -4501,7 +4504,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z2_I1_POS1_GP_1
-            
+        
             modulepar GlcPart PICS_Z2_I1_POS1_GP_2 := {
                 zoneId                                         := 2, 
                 laneNumber                                     := omit,
@@ -4537,7 +4540,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z2_I1_POS1_GP_2
-            
+        
             modulepar IvimParm PICS_Z2_I1_POS1 := {
                 provider := {
                     countryCode                                := '0000000001'B,
@@ -4547,13 +4550,13 @@ module ItsRSUsSimulator_Pics {
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z2_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z2_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z2_I1_POS1_GP_1,
-                                PICS_Z2_I1_POS1_GP_2
+                                c_PICS_Z2_I1_POS1_GP_1,
+                                c_PICS_Z2_I1_POS1_GP_2
                             } 
                         }
                     },
@@ -4591,7 +4594,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 57
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := {
@@ -4673,7 +4676,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 44
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := omit
@@ -4687,18 +4690,18 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z2_I1_POS1
-            
-        } // End of group ivimZone2 
         
+        } // End of group ivimZone2 
+    
         group ivimZone3 {
-            
+        
             modulepar ReferencePosition PICS_Z3_I1_POS1_RP := {
                 latitude                                       := 435533069,
                 longitude                                      := 103024528,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z3_I1_POS1_RP
-            
+        
             modulepar GlcPart PICS_Z3_I1_POS1_GP_1 := {
                 zoneId                                         := 1, 
                 laneNumber                                     := omit,
@@ -4734,7 +4737,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z3_I1_POS1_GP_1
-            
+        
             modulepar GlcPart PICS_Z3_I1_POS1_GP_2 := {
                 zoneId                                         := 2, 
                 laneNumber                                     := omit,
@@ -4770,7 +4773,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z3_I1_POS1_GP_2
-            
+        
             modulepar IvimParm PICS_Z3_I1_POS1 := {
                 provider := {
                     countryCode                                := '0000000001'B,
@@ -4780,13 +4783,13 @@ module ItsRSUsSimulator_Pics {
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z3_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z3_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z3_I1_POS1_GP_1,
-                                PICS_Z3_I1_POS1_GP_2
+                                c_PICS_Z3_I1_POS1_GP_1,
+                                c_PICS_Z3_I1_POS1_GP_2
                             } 
                         }
                     },
@@ -4824,7 +4827,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 57
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := {
@@ -4906,7 +4909,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 44
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := omit
@@ -4920,18 +4923,18 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z3_I1_POS1
-            
-        } // End of group ivimZone3 
         
+        } // End of group ivimZone3 
+    
         group ivimZone4 {
-            
+        
             modulepar ReferencePosition PICS_Z4_I1_POS1_RP := {
                 latitude                                       := 435563484,
                 longitude                                      := 103042973,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z4_I1_POS1_RP
-            
+        
             modulepar GlcPart PICS_Z4_I1_POS1_GP_1 := {
                 zoneId                                         := 1, 
                 laneNumber                                     := omit,
@@ -4967,7 +4970,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z4_I1_POS1_GP_1
-            
+        
             modulepar GlcPart PICS_Z4_I1_POS1_GP_2 := {
                 zoneId                                         := 2, 
                 laneNumber                                     := omit,
@@ -5003,7 +5006,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z4_I1_POS1_GP_2
-            
+        
             modulepar IvimParm PICS_Z4_I1_POS1 := {
                 provider := {
                     countryCode                                := '0000000001'B,
@@ -5013,13 +5016,13 @@ module ItsRSUsSimulator_Pics {
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z4_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z4_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z4_I1_POS1_GP_1,
-                                PICS_Z4_I1_POS1_GP_2
+                                c_PICS_Z4_I1_POS1_GP_1,
+                                c_PICS_Z4_I1_POS1_GP_2
                             } 
                         }
                     },
@@ -5057,7 +5060,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 57
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := {
@@ -5139,7 +5142,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 44
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := omit
@@ -5153,18 +5156,18 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z4_I1_POS1
-            
-        } // End of group ivimZone4 
         
+        } // End of group ivimZone4 
+    
         group ivimZone5 {
-            
+        
             modulepar ReferencePosition PICS_Z5_I1_POS1_RP := {
                 latitude                                       := 435582342,
                 longitude                                      := 103065544,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z5_I1_POS1_RP
-            
+        
             modulepar GlcPart PICS_Z5_I1_POS1_GP_1 := {
                 zoneId                                         := 1, 
                 laneNumber                                     := omit,
@@ -5200,7 +5203,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z5_I1_POS1_GP_1
-            
+        
             modulepar GlcPart PICS_Z5_I1_POS1_GP_2 := {
                 zoneId                                         := 2, 
                 laneNumber                                     := omit,
@@ -5236,7 +5239,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z5_I1_POS1_GP_2
-            
+        
             modulepar IvimParm PICS_Z5_I1_POS1 := {
                 provider := {
                     countryCode                                := '0000000001'B,
@@ -5246,13 +5249,13 @@ module ItsRSUsSimulator_Pics {
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z5_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z5_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z5_I1_POS1_GP_1,
-                                PICS_Z5_I1_POS1_GP_2
+                                c_PICS_Z5_I1_POS1_GP_1,
+                                c_PICS_Z5_I1_POS1_GP_2
                             } 
                         }
                     },
@@ -5290,7 +5293,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 57
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := {
@@ -5372,7 +5375,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 44
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := omit
@@ -5386,18 +5389,18 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z5_I1_POS1
-            
-        } // End of group ivimZone5 
         
+        } // End of group ivimZone5 
+    
         group ivimZone6 {
-            
+        
             modulepar ReferencePosition PICS_Z6_I1_POS1_RP := {
                 latitude                                       := 435551186,
                 longitude                                      := 103033248,
-                positionConfidenceEllipse                      := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
-                altitude                                       := PICS_IVIM_ALTITUDE
+                positionConfidenceEllipse                      := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+                altitude                                       := c_PICS_IVIM_ALTITUDE
             } // End of PICS_Z6_I1_POS1_RP
-            
+        
             modulepar GlcPart PICS_Z6_I1_POS1_GP_1 := {
                 zoneId                                         := 1, 
                 laneNumber                                     := omit,
@@ -5433,7 +5436,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z6_I1_POS1_GP_1
-            
+        
             modulepar GlcPart PICS_Z6_I1_POS1_GP_2 := {
                 zoneId                                         := 2, 
                 laneNumber                                     := omit,
@@ -5469,7 +5472,7 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z6_I1_POS1_GP_2
-            
+        
             modulepar IvimParm PICS_Z6_I1_POS1 := {
                 provider := {
                     countryCode                                := '0000000001'B,
@@ -5479,13 +5482,13 @@ module ItsRSUsSimulator_Pics {
                 iviContainers := { 
                     {
                         glc := {
-                            referencePosition                      := PICS_Z6_I1_POS1_RP,
+                            referencePosition                      := c_PICS_Z6_I1_POS1_RP,
                             referencePositionTime                  := omit,
                             referencePositionHeading               := omit, 
                             referencePositionSpeed                 := omit,
                             parts := {
-                                PICS_Z6_I1_POS1_GP_1,
-                                PICS_Z6_I1_POS1_GP_2
+                                c_PICS_Z6_I1_POS1_GP_1,
+                                c_PICS_Z6_I1_POS1_GP_2
                             } 
                         }
                     },
@@ -5523,7 +5526,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 57
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := {
@@ -5605,7 +5608,7 @@ module ItsRSUsSimulator_Pics {
                                                     pictogramCategoryCode := {
                                                         nature := 5,
                                                         serialNumber := 44
-                                                    
+                                                
                                                     }
                                                 },
                                                 attributes := omit
@@ -5619,32 +5622,34 @@ module ItsRSUsSimulator_Pics {
                     }
                 }
             } // End of PICS_Z6_I1_POS1
-            
-        } // End of group ivimZone6 
         
+        } // End of group ivimZone6 
+    
         modulepar IvimParmListRsu PICS_IVIM_PARMS_RSUs := {
-            PICS_Z1_I1_POS1,                             // RSU #1
-            PICS_Z2_I1_POS1,/*{ 
+            c_PICS_Z1_I1_POS1,                             // RSU #1
+            c_PICS_Z2_I1_POS1,/*{ 
                 provider := omit, 
                 iviIdentificationNumber := omit, 
                 iviContainers := omit 
             },*/                                           // RSU #2                             // RSU #3
-            PICS_Z5_I1_POS1,                             // RSU #4
-            PICS_Z4_I1_POS1,                             // RSU #5
+            c_PICS_Z5_I1_POS1,                             // RSU #4
+            c_PICS_Z4_I1_POS1,                             // RSU #5
             { 
                 provider := omit, 
                 iviIdentificationNumber := omit, 
                 iviContainers := omit 
             },                                           // RSU #6
-            PICS_Z6_I1_POS1,                             // RSU #7
+            c_PICS_Z6_I1_POS1,                             // RSU #7
             { 
                 provider := omit, 
                 iviIdentificationNumber := omit, 
                 iviContainers := omit 
             }                                            // RSU #8
         } // End of PICS_IVIM_PARMS_RSUs
-        
+    
     } // End of group ivimEvents 
+
+    group ssemEvents {
     
     group poimEvents {
         
@@ -5706,59 +5711,57 @@ module ItsRSUsSimulator_Pics {
     
     group ssemEvents {
         
-        group ssemCommonParams {
-            
             modulepar BtpPortId PICS_SSEM_BTP_DESTINATION_PORT := 2008;
-            
+        
             modulepar BtpPortId PICS_SSEM_BTP_SOURCE_PORT      := 0;
-            
-        } // End of group ssemCommonParams
         
-    } // End of group ssemEvents
+        } // End of group ssemCommonParams
     
+    } // End of group ssemEvents
+
     group sremEvents {
-        
+    
         group sremCommonParams {
-            
+        
             modulepar BtpPortId PICS_SREM_BTP_DESTINATION_PORT := 2007;
-            
+        
             modulepar BtpPortId PICS_SREM_BTP_SOURCE_PORT      := 0;
-            
+        
             modulepar UInt32 PICS_SREM_ITS_AID                 := 140;
-            
+        
             modulepar UInt32 PICS_SSEM_ITS_AID                 := 140;
-            
-        } // End of group sremCommonParams
         
-    } // End of group sremEvents
+        } // End of group sremCommonParams
     
+    } // End of group sremEvents
+
     group generationFrequencies {
-        
+    
         /**
          * @desc Beacon frequency timer
          */
         modulepar float PICS_BEACON_FREQUENCY    := 1.0;
-        
+    
         /**
          * @desc CAM frequency timer
          */
         modulepar float PICS_CAM_FREQUENCY       := 1.0;
-        
+    
         /**
          * @desc DENM frequency timer
          */
         modulepar float PICS_DENM_FREQUENCY      := int2float(PICS_DENM_REPETITION_INTERVAL) / 1000.0;
-        
+    
         /**
          * @desc MAPEM frequency timer
          */
         modulepar float PICS_MAPEM_FREQUENCY     := 1.0;
-        
+    
         /**
          * @desc SPATEMM frequency timer
          */
         modulepar float PICS_SPATEM_FREQUENCY    := 1.0;
-        
+    
         /**
          * @desc IVIM frequency timer
          */
@@ -5771,4 +5774,4 @@ module ItsRSUsSimulator_Pics {
         
     } // End of group generationFrequencies 
     
-} // End of module ItsRSUsSimulator_Pics 
\ No newline at end of file
+} // End of module ItsRSUsSimulator_Pics
\ No newline at end of file
diff --git a/ttcn/AtsSecurity/ItsSecurity_Functions.ttcn b/ttcn/AtsSecurity/ItsSecurity_Functions.ttcn
index fce1299da..d57ead280 100644
--- a/ttcn/AtsSecurity/ItsSecurity_Functions.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_Functions.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       Module containing functions for the secured GN ATS
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsSecurity_Functions {
diff --git a/ttcn/AtsSecurity/ItsSecurity_Pics.ttcn b/ttcn/AtsSecurity/ItsSecurity_Pics.ttcn
index f4ac0b87f..708ebc6d4 100644
--- a/ttcn/AtsSecurity/ItsSecurity_Pics.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_Pics.ttcn
@@ -3,6 +3,10 @@
  *  @version  $URL$
  *            $Id$
  *  @desc     Module containing Pics for Security ATS
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsSecurity_Pics {
diff --git a/ttcn/AtsSecurity/ItsSecurity_Templates.ttcn b/ttcn/AtsSecurity/ItsSecurity_Templates.ttcn
index a306f0b20..c76f987be 100644
--- a/ttcn/AtsSecurity/ItsSecurity_Templates.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_Templates.ttcn
@@ -3,6 +3,10 @@
  *  @version  $URL$
  *            $Id$
  *  @desc     Module containing templates for secured GeoNetworking ATS
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsSecurity_Templates {
diff --git a/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn
index c9c74e084..486e0af6f 100644
--- a/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn
@@ -4,6 +4,10 @@
  *            $Id$
  *  @desc     Testcases  file for Security Protocol
  *  @see      Draft ETSI TS 103 097 V1.3.1
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  */
 module ItsSecurity_TestCases {
     
diff --git a/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn b/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn
index 3983f7f4a..e7f483290 100644
--- a/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn
@@ -3,6 +3,10 @@
  *  @version  $URL$
  *            $Id$
  *  @desc     Test Control file for Security Protocol 
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsSecurity_TestControl {
diff --git a/ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn b/ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn
index 57c3ae7aa..f30eebeab 100644
--- a/ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       Module containing t fest system description for the secured GN ATS
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsSecurity_TestSystem { 
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
index 3da3f7c2f..d9e1e4e03 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     SREM Testcases (ETSI TS 103 191-2 v1.2.1)
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
index a8315d344..7b73d25c9 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestControl.ttcn
@@ -3,6 +3,10 @@
  *  @version    $URL$
  *              $Id$
  *  @desc       Test Control file for TLC
+ *  @copyright   ETSI Copyright Notification
+ *               No part may be reproduced except as authorized by written permission.
+ *               The copyright and the foregoing restriction extend to reproduction in all media.
+ *               All rights reserved.
  *
  */
 module ItsSrem_TestControl {
diff --git a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
index fbc4a1472..e42922a6b 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
@@ -3,6 +3,10 @@
  *    @version  $URL$
  *              $Id$
  *    @desc     SREM TP functions
+ *    @copyright   ETSI Copyright Notification
+ *                 No part may be reproduced except as authorized by written permission.
+ *                 The copyright and the foregoing restriction extend to reproduction in all media.
+ *                 All rights reserved.
  *
  */
 
-- 
GitLab