diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
index 5901a4e0f70c93b2efd07549bc98957e9cabe0f5..d8a7f99e7f84665a303014959ae6958ec738b721 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
@@ -134,7 +134,7 @@ module ItsRSUsSimulator_Functions {
         /**
          * @desc Default handling cf01 de-initialisation.
          */
-        altstep a_cf01Down() runs on ItsGeoNetworking {
+        altstep a_cf01Down() runs on ItsRSUsSimulator {
             [] a_shutdown() {
                 f_poDefault();
                 f_cf01Down();
diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
index b8488383901eb6895d957e7fe9f082b0ba66aec5..c998fe87ff7ec6b5080344e366c62d62831da004 100644
--- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
+++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
@@ -47,7 +47,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE01'O
+                mid                   := '001C6B0D0201'O
             } // End of PICS_RSU_GN_ADDRESS_RSU1
             
             modulepar RsuParm PICS_RSU1 := {
@@ -90,7 +90,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE02'O
+                mid                   := '001C6B0D0202'O
             } // End of PICS_RSU_GN_ADDRESS_RSU2
             
             modulepar RsuParm PICS_RSU2 := {
@@ -133,7 +133,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE03'O
+                mid                   := '001C6B0D0203'O
             } // End of PICS_RSU_GN_ADDRESS_RSU3
             
             modulepar RsuParm PICS_RSU3 := {
@@ -176,7 +176,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE04'O
+                mid                   := '001C6B0D0204'O
             } // End of PICS_RSU_GN_ADDRESS_RSU4
             
             modulepar RsuParm PICS_RSU4 := {
@@ -219,7 +219,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE05'O
+                mid                   := '001C6B0D0205'O
             } // End of PICS_RSU_GN_ADDRESS_RSU5
             
             modulepar RsuParm PICS_RSU5 := {
@@ -262,7 +262,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE06'O
+                mid                   := '001C6B0D0206'O
             } // End of PICS_RSU_GN_ADDRESS_RSU6
             
             modulepar RsuParm PICS_RSU6 := {
@@ -304,7 +304,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE07'O
+                mid                   := '001C6B0D0207'O
             } // End of PICS_RSU_GN_ADDRESS_RSU7
             
             modulepar RsuParm PICS_RSU7 := {
@@ -346,7 +346,7 @@ module ItsRSUsSimulator_Pics {
                 typeOfAddress         := e_manual,
                 stationType           := e_roadSideUnit,
                 stationCountryCode    := 33,
-                mid                   := '000ACCDDEE08'O
+                mid                   := '001C6B0D0208'O
             } // End of PICS_RSU_GN_ADDRESS_RSU8
             
             modulepar RsuParm PICS_RSU8 := {
@@ -425,37 +425,41 @@ module ItsRSUsSimulator_Pics {
         
         group camUseCase6 {
             
-            modulepar integer SIMULTANEOUS_VEHICLE_NUM        := 10;
-            
-            group camUseCase6VehicleTemplateDescription {
+            group camUseCase6VehicleDescription  {
                 
-                modulepar LongPosVector PICS_UC6_VEHICLE_TEMPLATE_POSITION := {
-                    gnAddr := {
-                        typeOfAddress         := e_manual,
-                        stationType           := e_passengerCar,
-                        stationCountryCode    := 33,
-                        mid                   := '000ACCDDEEFF'O
-                    },
-                    timestamp_                                    := 0,
-                    latitude                                      := 0,
-                    longitude                                     := 0,
-                    pai                                           := '0'B,
-                    speed                                         := 30,
-                    heading                                       := 0
-                } // End of PICS_UC6_VEHICLE_POSITION
+                modulepar integer SIMULTANEOUS_VEHICLE_NUM        := 10;
                 
-                modulepar GeoArea PICS_UC6_VEHICLE_TEMPLATE_GEOAREA := {
-                    shape := e_geoElip,
-                    area := {
-                        geoAreaPosLatitude                        := 0,
-                        geoAreaPosLongitude                       := 0,
-                        distanceA                                 := 5,
-                        distanceB                                 := 3,
-                        angle                                     := 0
-                    }
-                } // End of PICS_UC6_VEHICLE_GEOAREA
-                
-                modulepar boolean PICS_USE_SPV := true;
+                group camUseCase6VehicleTemplateDescription {
+                    
+                    modulepar LongPosVector PICS_UC6_VEHICLE_TEMPLATE_POSITION := {
+                        gnAddr := {
+                            typeOfAddress         := e_manual,
+                            stationType           := e_passengerCar,
+                            stationCountryCode    := 33,
+                            mid                   := '001C6B0D02FF'O
+                        },
+                        timestamp_                                    := 0,
+                        latitude                                      := 0,
+                        longitude                                     := 0,
+                        pai                                           := '0'B,
+                        speed                                         := 30,
+                        heading                                       := 0
+                    } // End of PICS_UC6_VEHICLE_POSITION
+                    
+                    modulepar GeoArea PICS_UC6_VEHICLE_TEMPLATE_GEOAREA := {
+                        shape := e_geoElip,
+                        area := {
+                            geoAreaPosLatitude                        := 0,
+                            geoAreaPosLongitude                       := 0,
+                            distanceA                                 := 5,
+                            distanceB                                 := 3,
+                            angle                                     := 0
+                        }
+                    } // End of PICS_UC6_VEHICLE_GEOAREA
+                    
+                    modulepar boolean PICS_USE_SPV := true;
+                    
+                } // End of group camUseCase6VehicleTemplateDescription 
                 
             } // End of group camUseCase6VehicleDescription