diff --git a/scripts/mec_generate_makefile.bash b/scripts/mec_generate_makefile.bash
index 917a764d1788a446d37c3466735b917ec2d1939d..2cb9adae5f441e4bc805db5b2b57e490eae1c112 100755
--- a/scripts/mec_generate_makefile.bash
+++ b/scripts/mec_generate_makefile.bash
@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \;
 find .. -type f -name "*.log" -exec rm {} \;
 
 # Build JSON files if any and put them in objs directory
-REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI"
+REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/RnisAPI LibMec/UEidentityAPI LibMec/BwManagementAPI"
 for i in ${REFERENCES}
 do
     # TTCN code
diff --git a/scripts/merge_mec_project.bash b/scripts/merge_mec_project.bash
index 6ec92b4d6a71cecc7d344e2103886237024a2ab9..21278e7a6a51899cd054d22150f1da3fe67c5375 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 LibMec/RnisAPI LibHttp LibCommon'
+TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibMec/BwManagementAPI 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 42d9a3153c710246c2da504550edddd11867a2d2..6af611696a0e704487dfa1a88adb317b0117c217 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 LibMec/RnisAPI LibHttp LibCommon'
+TTCN_3_LIB_LIST='LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibMec/RnisAPI LibMec/BwManagementAPI LibHttp LibCommon'
 for i in ${TTCN_3_LIB_LIST}
 do
     if [ ! -d ${TTCN_3_DST_PATH}/$i ]
@@ -147,6 +147,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/RnisAPI" ]
+    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/BwManagementAPI" ]
     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/LibMec/BwManagementApi/json/BwManagementApi.json b/ttcn/LibMec/BwManagementAPI/json/BwManagementApi.json
similarity index 100%
rename from ttcn/LibMec/BwManagementApi/json/BwManagementApi.json
rename to ttcn/LibMec/BwManagementAPI/json/BwManagementApi.json
diff --git a/ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_Pics.ttcn b/ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_Pics.ttcn
similarity index 100%
rename from ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_Pics.ttcn
rename to ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_Pics.ttcn
diff --git a/ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_Pixits.ttcn b/ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_Pixits.ttcn
similarity index 100%
rename from ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_Pixits.ttcn
rename to ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_Pixits.ttcn
diff --git a/ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_Templates.ttcn b/ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_Templates.ttcn
similarity index 100%
rename from ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_Templates.ttcn
rename to ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_Templates.ttcn
diff --git a/ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_TypesAndValues.ttcn b/ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_TypesAndValues.ttcn
similarity index 100%
rename from ttcn/LibMec/BwManagementApi/ttcn/BwManagementAPI_TypesAndValues.ttcn
rename to ttcn/LibMec/BwManagementAPI/ttcn/BwManagementAPI_TypesAndValues.ttcn
diff --git a/ttcn/LibMec/RnisAPI/ttcn/RnisAPI_Pixits.ttcn b/ttcn/LibMec/RnisAPI/ttcn/RnisAPI_Pixits.ttcn
index 551180b84fc13c06787618712f3545893f3c4d58..cb6d0604c8afb41e3a68d44fd0ea72a8a20b7349 100644
--- a/ttcn/LibMec/RnisAPI/ttcn/RnisAPI_Pixits.ttcn
+++ b/ttcn/LibMec/RnisAPI/ttcn/RnisAPI_Pixits.ttcn
@@ -8,6 +8,6 @@ module RnisAPI_Pixits {
 
   modulepar JSON.String PX_SUBSCRIPTION_ID := "7777";
 
-  modulepar Link PX_LINKS_SELF := { self_ := "http://meAppServer.example.com/rni/v1/subscriptions" };
+  modulepar Link PX_LINKS_SELF := { self_ := "http://example.com/exampleAPI/rni/v2/subscriptions/" };
 
 } // End of module RnisAPI_Pixits