diff --git a/Test Purposes/SRV/Ams/Ams_BO_BI.tplan2 b/Test Purposes/SRV/AMS/Ams_BO_BI.tplan2
similarity index 99%
rename from Test Purposes/SRV/Ams/Ams_BO_BI.tplan2
rename to Test Purposes/SRV/AMS/Ams_BO_BI.tplan2
index c12ecd868a03f225aee95bcbb4b5886d6e7ebac2..151999a07a09807862d6d5844ac405d9bd5c2807 100644
--- a/Test Purposes/SRV/Ams/Ams_BO_BI.tplan2	
+++ b/Test Purposes/SRV/AMS/Ams_BO_BI.tplan2	
@@ -13,7 +13,7 @@ copyright notice shall be included in all copies of whole or part of this
 file and shall not imply any sub-license right.
 */
 
-Package MEC021_APP_MP1_AMS_BV {
+Package MEC021_APP_MP1_AMS_BO_BI {
 
    import all from MEC_Common;
    
diff --git a/Test Purposes/SRV/Ams/Ams_BV.tplan2 b/Test Purposes/SRV/AMS/Ams_BV.tplan2
similarity index 100%
rename from Test Purposes/SRV/Ams/Ams_BV.tplan2
rename to Test Purposes/SRV/AMS/Ams_BV.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisAllSubscriptions_BO_BI.tplan2 b/Test Purposes/SRV/RNIS/RnisAllSubscriptions_BO_BI.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisAllSubscriptions_BO_BI.tplan2
rename to Test Purposes/SRV/RNIS/RnisAllSubscriptions_BO_BI.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisAllSubscriptions_BV.tplan2 b/Test Purposes/SRV/RNIS/RnisAllSubscriptions_BV.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisAllSubscriptions_BV.tplan2
rename to Test Purposes/SRV/RNIS/RnisAllSubscriptions_BV.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisNotifications.tplan2 b/Test Purposes/SRV/RNIS/RnisNotifications.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisNotifications.tplan2
rename to Test Purposes/SRV/RNIS/RnisNotifications.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisQuery_BO_BI.tplan2 b/Test Purposes/SRV/RNIS/RnisQuery_BO_BI.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisQuery_BO_BI.tplan2
rename to Test Purposes/SRV/RNIS/RnisQuery_BO_BI.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisQuery_BV.tplan2 b/Test Purposes/SRV/RNIS/RnisQuery_BV.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisQuery_BV.tplan2
rename to Test Purposes/SRV/RNIS/RnisQuery_BV.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisSpecificSubscription_BO_BI.tplan2 b/Test Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisSpecificSubscription_BO_BI.tplan2
rename to Test Purposes/SRV/RNIS/RnisSpecificSubscription_BO_BI.tplan2
diff --git a/Test Purposes/SRV/Rnis/RnisSpecificSubscription_BV.tplan2 b/Test Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
similarity index 100%
rename from Test Purposes/SRV/Rnis/RnisSpecificSubscription_BV.tplan2
rename to Test Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2