diff --git a/scripts/merge_mec_project.bash b/scripts/merge_mec_project.bash
index eaf020b3a877675a8f98b4409db0c01c0ce3ae28..6ec92b4d6a71cecc7d344e2103886237024a2ab9 100755
--- a/scripts/merge_mec_project.bash
+++ b/scripts/merge_mec_project.bash
@@ -158,7 +158,7 @@ done
 echo 'Update TTCN-3 files'
 TTCN_3_ORG_PATH=${SRC_MEC_PATH}/ttcn
 TTCN_3_DST_PATH=${PATH_DEV_MEC}/src
-TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibHttp LibCommon'
+TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibHttp LibCommon'
 for i in ${TTCN_3_ATS_LIST}
 do
     # TTCN-3 files
diff --git a/scripts/update_mec_project.bash b/scripts/update_mec_project.bash
index 02335e541566aed50d6dfca248c282fbc8e10759..0f418ba576557a3388a29b610d52b985aaf190aa 100755
--- a/scripts/update_mec_project.bash
+++ b/scripts/update_mec_project.bash
@@ -125,7 +125,7 @@ do
 done
 
 # Update libraries & CC files
-TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibHttp LibCommon'
+TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibHttp LibCommon'
 for i in ${TTCN_3_LIB_LIST}
 do
     if [ ! -d ${TTCN_3_DST_PATH}/$i ]
@@ -143,6 +143,10 @@ do
         cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
         cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
     elif [ "$i" == "LibMec/UEidentityAPI" ]
+    then
+        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
+        cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
+    elif [ "$i" == "LibMec/RnsiAPI" ]
     then
         cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn
         cp ${TTCN_3_ORG_PATH}/$i/json/*.json ${TTCN_3_DST_PATH}/$i/json
diff --git a/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
index 84a7d31adf1712abc76699f5212a7fb97bef459c..3b220ac7b75471ee73d859d0efe64219385f28d3 100644
--- a/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
@@ -46,8 +46,8 @@ module AtsMec_LocationAPI_TestCases {
         var HttpMessage v_response;
         
         // Test control
-        if (not(PICS_ME_APP_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
-            log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+        if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
+            log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
             setverdict(inconc);
             stop;
         }
diff --git a/ttcn/AtsMec/AtsMec_RnisAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_RnisAPI_TestCases.ttcn
index 217b2a69d31f138e721965e3a553cfe9b60e2759..3753452bd5b7c8ee479e8267eeb3f289c5443690 100644
--- a/ttcn/AtsMec/AtsMec_RnisAPI_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_RnisAPI_TestCases.ttcn
@@ -62,7 +62,7 @@ module AtsMec_RnisAPI_TestCases {
         httpPort.send(
                       m_http_request(
                                      m_http_request_get(
-                                                        PICS_RNIS_SUBSCRITIONS_URI & oct2char(unichar2oct(PX_ZONE_ID, "UTF-8")),
+                                                        PICS_RNIS_SUBSCRITIONS_URI & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")),
                                                         v_headers
                                                         )
                                      )
@@ -76,9 +76,9 @@ module AtsMec_RnisAPI_TestCases {
                               mw_http_response(
                                                mw_http_response_ok(
                                                                    mw_http_message_body_json(
-                                                                                             mw_body_json_(
-                                                                                                           mw_cell_change_subscription
-                                                                                                           ))))) -> value v_response {
+                                                                                             mw_body_json_cell_change_subscription(
+                                                                                                                                   mw_cell_change_subscription
+                                                                                                                                   ))))) -> value v_response {
             log("*** " & testcasename() & ": PASS: IUT successfully responds with a cell subscription ***");
             f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
           }
diff --git a/ttcn/AtsMec/AtsMec_TestControl.ttcn b/ttcn/AtsMec/AtsMec_TestControl.ttcn
index b5f6ac750b20b587d6492b6046712755b8de1e4d..88d4603b12ad366f0cccc04c10ded5360eed5dea 100644
--- a/ttcn/AtsMec/AtsMec_TestControl.ttcn
+++ b/ttcn/AtsMec/AtsMec_TestControl.ttcn
@@ -18,7 +18,7 @@ module AtsMec_TestControl {
   
   control {
     
-    if (PICS_ME_PLAT_IUT) {
+    if (PICS_PLAT_IUT) {
       if (PICS_LOCATION_API_SUPPORTED) {
         execute(TC_MEC_PLAT_MP1_LOC_BV_001());
       }
diff --git a/ttcn/AtsMec/AtsMec_UEidentityAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_UEidentityAPI_TestCases.ttcn
index 107d712aad9c29e9f2d8f5a6fde173740454c510..ffacfc2ecfc02819507d345595e2117af245eac5 100644
--- a/ttcn/AtsMec/AtsMec_UEidentityAPI_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_UEidentityAPI_TestCases.ttcn
@@ -46,8 +46,8 @@ module AtsMec_UEidentityAPI_TestCases {
       var HttpMessage v_response;
         
       // Test control
-      if (not(PICS_ME_APP_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
-        log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+      if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
+        log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
         setverdict(inconc);
         stop;
       }
@@ -104,8 +104,8 @@ module AtsMec_UEidentityAPI_TestCases {
       var HttpMessage v_response;
       
       // Test control
-      if (not(PICS_ME_APP_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
-        log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+      if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
+        log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
         setverdict(inconc);
         stop;
       }
@@ -173,8 +173,8 @@ module AtsMec_UEidentityAPI_TestCases {
       var HttpMessage v_response;
       
       // Test control
-      if (not(PICS_ME_APP_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
-        log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+      if (not(PICS_PLAT_IUT) or not(PICS_UE_IDENTITY_API_SUPPORTED)) {
+        log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
         setverdict(inconc);
         stop;
       }
diff --git a/ttcn/AtsMec/AtsMec_UEinformation_TestCases.ttcn b/ttcn/AtsMec/AtsMec_UEinformation_TestCases.ttcn
index 0d03490635928371aa07d9615a75d9dd8c3b0be7..31d7182eb0f8171153cb775128666eaa9baaf419 100644
--- a/ttcn/AtsMec/AtsMec_UEinformation_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_UEinformation_TestCases.ttcn
@@ -46,8 +46,8 @@ module AtsMec_UEinformation_TestCases {
         var HttpMessage v_response;
         
         // Test control
-        if (not(PICS_ME_APP_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
-            log("*** " & testcasename() & ": PICS_ME_APP_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
+        if (not(PICS_PLAT_IUT) or not(PICS_LOCATION_API_SUPPORTED)) {
+            log("*** " & testcasename() & ": PICS_PLAT_IUT and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
             setverdict(inconc);
             stop;
         }
diff --git a/ttcn/LibMec/ttcn/LibMec_Pics.ttcn b/ttcn/LibMec/ttcn/LibMec_Pics.ttcn
index 268af7299366776c7653239105c1e01c565c4a04..e098a9294eeb5a6a0da1f520cc5dd936c80a9720 100644
--- a/ttcn/LibMec/ttcn/LibMec_Pics.ttcn
+++ b/ttcn/LibMec/ttcn/LibMec_Pics.ttcn
@@ -4,7 +4,7 @@ module LibMec_Pics {
    * @desc Does the IUT act as Edge Mobile Application?
    * TODO Renane into PIC_MEC_PLAT
    */
-  modulepar boolean PICS_ME_PLAT_IUT := false;
+  modulepar boolean PICS_PLAT_IUT := false;
   
   /**
    * @desc Does the IUT act as Edge Mobile Application?