diff --git a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
index 7d23abd27a741cf5ad36fd210b95e4941b8133e5..6e5b229a924d89d3da4622fca63828bf1cb7f1c9 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
@@ -771,11 +771,11 @@ module ItsIvim_TestCases {
          * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_MSGF_BV_02
          * @reference ETSI TS 103 301 v1.2.1 Clause 7.4.3.2
          */
-        testcase TC_IVIM_MSP_BV_01() runs on ItsIvim system ItsIvimSystem {
+        testcase TC_IS_IVIM_MSP_BV_01() runs on ItsIvim system ItsIvimSystem {
             
             f_IS_IVI_MSGF_BV_02();
             
-        } // end TC_IVIM_MSP_BV_01
+        } // end TC_IS_IVIM_MSP_BV_01
         
     } // End of group iviMessageReception
     
diff --git a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
index 87df6e75c46d9c0090ba93a1cc59587e5ba84386..0eeadc1c397cc429d36bc740f6131b4076d88065 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestControl.ttcn
@@ -44,12 +44,12 @@ module ItsIvim_TestControl {
             execute(TC_IS_IVI_EVUP_BV_02());
             execute(TC_IS_IVI_EVUP_BV_03());
             execute(TC_IS_IVI_EVUP_BV_04());
-            execute(TC_IS_IVI_EVUP_BV_01());
+            execute(TC_IS_IVI_EVUP_BV_05());
             execute(TC_IS_IVI_EVRP_BV_01());
             execute(TC_IS_IVI_EVRP_BV_02());
         }
         if (PICS_IVIM_RECEPTION) {
-            execute(TC_IVIM_MSP_BV_01());
+            execute(TC_IS_IVIM_MSP_BV_01());
         }
     }
     
diff --git a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
index 5da4e65b88dc7616fec709c8a7a83f9c7e1a9274..93f4394e3480b8b7ad20996f0e04ac1a2323601c 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TpFunctions.ttcn
@@ -65,7 +65,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                         
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     tc_ac.start;
                     alt {
@@ -118,7 +118,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     tc_ac.start;
                     alt {
@@ -152,9 +152,9 @@ module ItsSrem_TpFunctions {
                     
                     // Local variables
                     var template (value) UtSremTriggerList v_utTriggers := {
-                        m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL),
-                        m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL),
-                        m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL)
+                        m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL),
+                        m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL),
+                        m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL)
                     }
                     var boolean v_success := true;
                     var RequestIDList v_requestIDList;
@@ -181,7 +181,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     f_utTriggerEvent(v_utTriggers[lengthof(v_utTriggers) - 1]);
                     f_awaitSreMessage(mw_sremInd(mw_sremPdu(mw_sremWellFormatted)), v_sremInds[i]);
@@ -238,7 +238,7 @@ module ItsSrem_TpFunctions {
                         
                     // Preamble
                     f_prInitialState();
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     f_awaitSreMessage(mw_sremInd(mw_sremPdu(mw_sremWellFormatted)), v_sremInd);
                     f_sendSseMessage(v_sremInd.msgIn.srm);
                     v_requestID := v_sremInd.msgIn.srm.requests[0].request.requestID;
@@ -246,7 +246,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utUpdateEvent(m_utUpdateEvent(v_requestID, PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utUpdateEvent(m_utUpdateEvent(v_requestID, PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     tc_ac.start;
                     alt {
@@ -308,7 +308,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     tc_ac.start;
                     alt {
@@ -375,7 +375,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                     
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     tc_ac.start;
                     alt {
@@ -434,7 +434,7 @@ module ItsSrem_TpFunctions {
                     f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
                         
                     // Test Body
-                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICEVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
+                    f_utTriggerEvent(m_utTriggerEvent(PX_BASICVEHICLEROLE, PX_REQUESTIMPORTANCELEVEL));
                     
                     tc_ac.start;
                     alt {