diff --git a/Test Purposes/Plat/Mp1/Bandwidth/PlatBandwidthManager.tplan2 b/Test Purposes/Plat/Mp1/Bandwidth/PlatBandwidthManager.tplan2
index dfe235a89c4b70d8b3471a489ef7f0024cd988ce..ebd5cf03eafe6c90373db860b370154a41cc15e8 100644
--- a/Test Purposes/Plat/Mp1/Bandwidth/PlatBandwidthManager.tplan2	
+++ b/Test Purposes/Plat/Mp1/Bandwidth/PlatBandwidthManager.tplan2	
@@ -48,7 +48,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "bwm/v1/bw_allocations",
+                  uri indicating value "bwm/v1/bw_allocations",
                   query_parameters containing
                      app_instance_id indicating value APP_INSTANCE_ID
                   ;
@@ -97,7 +97,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "bwm/v1/bw_allocations",
+                  uri indicating value "bwm/v1/bw_allocations",
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -154,7 +154,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -203,8 +203,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -261,8 +261,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPATCH containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -314,7 +314,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -354,7 +354,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "bwm/v1/bw_allocations",
+                  uri indicating value "bwm/v1/bw_allocations",
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      app_id indicating value APP_INSTANCE_ID
@@ -398,7 +398,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "bwm/v1/bw_allocations",
+                  uri indicating value "bwm/v1/bw_allocations",
                   query_parameters containing
                      app_instance_id indicating value APP_INSTANCE_ID
                   ;
@@ -442,7 +442,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "bwm/v1/bw_allocations",
+                  uri indicating value "bwm/v1/bw_allocations",
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -488,7 +488,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a POST containing
-                  Uri indicating value "bwm/v1/bw_allocations",
+                  uri indicating value "bwm/v1/bw_allocations",
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -536,7 +536,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -579,7 +579,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}"
+                  uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -623,8 +623,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -673,8 +673,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -723,8 +723,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -773,8 +773,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value INVALID_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value INVALID_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -823,8 +823,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPATCH containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      requestType indicating value INVALID_TYPE,
@@ -874,8 +874,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a PATCH containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -924,8 +924,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPATCH containing
-                  Uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -974,8 +974,8 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vPATCH containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
-                  If_Match indicating value INVALID_ETAG,
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}",
+                  if_match indicating value INVALID_ETAG,
                   body containing
                      appInsId indicating value APP_INSTANCE_ID,
                      fixedAllocation indicating value SOME_ALLOCATION,
@@ -1020,7 +1020,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a DELETE containing
-                  Uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
+                  uri indicating value "bwm/v1/bw_allocations/{ALLOCATION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -1060,7 +1060,7 @@ Package plat_bandwidth_manager {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}"
+                  uri indicating value "bwm/v1/bw_allocations/{NON_EXISTENT_ALLOCATION_ID}"
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/DnsRules/PlatDnsRules.tplan2 b/Test Purposes/Plat/Mp1/DnsRules/PlatDnsRules.tplan2
index 274b43c302c117ddb65ea5956199b7ff78d9f262..0278fd6053304c0175a5e9c4452c917c9db05225 100644
--- a/Test Purposes/Plat/Mp1/DnsRules/PlatDnsRules.tplan2	
+++ b/Test Purposes/Plat/Mp1/DnsRules/PlatDnsRules.tplan2	
@@ -28,7 +28,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with a list of active DNS rules
          when queried by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.12.3.1",
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.12.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/DnsRule"
 
       Config Id Config_MEC_1
@@ -47,7 +47,7 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules"
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules"
                ;
                from the MEC_APP entity
             }
@@ -74,7 +74,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with the information on a specific DNS rule
          when queried by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.1",
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/DnsRule"
 
       Config Id Config_MEC_1
@@ -96,7 +96,7 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}" 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}" 
                ;
                from the MEC_APP entity
             }
@@ -123,7 +123,7 @@ Package plat_dns_rules {
          "Check that the IUT updates a specific DNS rule
          when commanded by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.2",
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.2",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/DnsRule"
 
       Config Id Config_MEC_1
@@ -145,8 +145,8 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      dnsRuleId indicating value DNS_RULE_NAME,
                      ipAddress indicating value SOME_IP_ADDRESS
@@ -178,7 +178,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.1"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.1"
 
       Config Id Config_MEC_1
 
@@ -199,7 +199,7 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}" 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}" 
                ;
                from the MEC_APP entity
             }
@@ -221,7 +221,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with an error when
          a request for an unknown URI is sent by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.1"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.1"
 
       Config Id Config_MEC_1
 
@@ -242,7 +242,7 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{NON_EXISTENT_DNS_RULE_ID}" 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{NON_EXISTENT_DNS_RULE_ID}" 
                ;
                from the MEC_APP entity
             }
@@ -264,7 +264,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with an error when
          a request with incorrect parameters is sent by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.2"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.2"
 
       Config Id Config_MEC_1
 
@@ -285,8 +285,8 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      dnsRuleId indicating value DNS_RULE_NAME,
                      // Unknown parameter value should trigger an error response.
@@ -313,7 +313,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.2"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.2"
 
       Config Id Config_MEC_1
 
@@ -334,8 +334,8 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      dnsRuleId indicating value DNS_RULE_NAME,
                      state indicating value STATE_VALUE
@@ -361,7 +361,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with an error when
          a request for an unknown URI is sent by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.2"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.2"
 
       Config Id Config_MEC_1
 
@@ -382,8 +382,8 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{NON_EXISTENT_DNS_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{NON_EXISTENT_DNS_RULE_ID}",
+                  if_match indicating value PROPER_ETAG 
                   body containing
                      dnsRuleId indicating value DNS_RULE_NAME,
                      ipAddress indicating value SOME_IP_ADDRESS
@@ -409,7 +409,7 @@ Package plat_dns_rules {
          "Check that the IUT responds with an error when
          a request sent by a MEC Application doesn't comply with a required condition"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.13.3.2"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.13.3.2"
 
       Config Id Config_MEC_1
 
@@ -430,8 +430,8 @@ Package plat_dns_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
-                  If_Match indicating value INVALID_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/dns_rules/{DNS_RULE_ID}",
+                  if_match indicating value INVALID_ETAG
                   body containing
                      dnsRuleId indicating value DNS_RULE_NAME,
                      ipAddress indicating value SOME_IP_ADDRESS
diff --git a/Test Purposes/Plat/Mp1/FAIS/PlatFixedAcessInfo.tplan2 b/Test Purposes/Plat/Mp1/FAIS/PlatFixedAcessInfo.tplan2
index 9e9d5765d290edfbe5042acc865e2773613b5478..561a09b6198a18e58472e06d2c77d1045ff6e776 100644
--- a/Test Purposes/Plat/Mp1/FAIS/PlatFixedAcessInfo.tplan2	
+++ b/Test Purposes/Plat/Mp1/FAIS/PlatFixedAcessInfo.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 plat_mp1_fixed_access_info{
+Package plat_fixed_access_info {
    
    import all from MEC_Common;
 
@@ -43,7 +43,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/fa_info"
+                  uri indicating value "/fai/v1/queries/fa_info"
                ;
                from the MEC_APP entity
             }
@@ -83,7 +83,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/device_info"
+                  uri indicating value "/fai/v1/queries/device_info"
                ;
                from the MEC_APP entity
             }
@@ -123,7 +123,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/cable_line_info"
+                  uri indicating value "/fai/v1/queries/cable_line_info"
                ;
                from the MEC_APP entity
             }
@@ -163,7 +163,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/optical_network_info"
+                  uri indicating value "/fai/v1/queries/optical_network_info"
                ;
                from the MEC_APP entity
             }
@@ -203,7 +203,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/subscriptions"
+                  uri indicating value "/fai/v1/subscriptions"
                ;
                from the MEC_APP entity
             }
@@ -243,7 +243,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "fai/v1/subscriptions" 
+                  uri indicating value "fai/v1/subscriptions" 
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType indicating value "OnuAlarmSubscription", 
@@ -268,7 +268,7 @@ Package plat_mp1_fixed_access_info{
                and
                // MEC 029, clause 7.7.3.4
                the IUT entity sends a vPOST containing
-                  Uri indicating value CALLBACK_URL 
+                  uri indicating value CALLBACK_URL 
                   body containing
                      OnuAlarmNotification containing 
                         notificationType set to "OnuAlarmSubscription"
@@ -306,7 +306,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -352,7 +352,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType set to "OnuAlarmSubscription"
@@ -402,7 +402,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -439,7 +439,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "fai/v1/subscriptions" 
+                  uri indicating value "fai/v1/subscriptions" 
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType indicating value "DevInfoSubscription", 
@@ -467,7 +467,7 @@ Package plat_mp1_fixed_access_info{
                and
                // MEC 029, clause 5.2.6.2
                the IUT entity sends a vPOST containing
-                  Uri indicating value CALLBACK_URL 
+                  uri indicating value CALLBACK_URL 
                   body containing
                      ExpiryNotification containing 
                         expiryDeadline indicating value NOW_PLUS_X_SECONDS    // TODO: how to set this?
@@ -545,7 +545,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/fa_info"
+                  uri indicating value "/fai/v1/queries/fa_info"
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      interface indicating value any_value
@@ -586,7 +586,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "/fai/v1/queries/fa_info"
+                  uri indicating value "/fai/v1/queries/fa_info"
                ;
                from the MEC_APP entity
             }
@@ -623,7 +623,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/fai/v1/queries/fa_info"
+                  uri indicating value "/fai/v1/queries/fa_info"
                ;
                from the MEC_APP entity
             }
@@ -660,7 +660,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/fa_info"
+                  uri indicating value "/fai/v1/queries/fa_info"
                   query_parameters containing
                      interfaceType indicating value 1
                   ; 
@@ -700,7 +700,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/device_info"
+                  uri indicating value "/fai/v1/queries/device_info"
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      device indicating value any_value
@@ -741,7 +741,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "/fai/v1/queries/device_info"
+                  uri indicating value "/fai/v1/queries/device_info"
                ;
                from the MEC_APP entity
             }
@@ -778,7 +778,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/fai/v1/queries/device_info"
+                  uri indicating value "/fai/v1/queries/device_info"
                ;
                from the MEC_APP entity
             }
@@ -815,7 +815,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/device_info"
+                  uri indicating value "/fai/v1/queries/device_info"
                   query_parameters containing
                      gwId indicating value UNKNOWN_VALUE
                   ; 
@@ -855,7 +855,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/cable_line_info"
+                  uri indicating value "/fai/v1/queries/cable_line_info"
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      cm indicating value any_value
@@ -896,7 +896,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "/fai/v1/queries/cable_line_info"
+                  uri indicating value "/fai/v1/queries/cable_line_info"
                ;
                from the MEC_APP entity
             }
@@ -933,7 +933,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/fai/v1/queries/cable_line_info"
+                  uri indicating value "/fai/v1/queries/cable_line_info"
                ;
                from the MEC_APP entity
             }
@@ -970,7 +970,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/cable_line_info"
+                  uri indicating value "/fai/v1/queries/cable_line_info"
                   query_parameters containing
                      cmId indicating value UNKNOWN_VALUE
                   ; 
@@ -1010,7 +1010,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/optical_network_info"
+                  uri indicating value "/fai/v1/queries/optical_network_info"
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      onu indicating value any_value
@@ -1051,7 +1051,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "/fai/v1/queries/optical_network_info"
+                  uri indicating value "/fai/v1/queries/optical_network_info"
                ;
                from the MEC_APP entity
             }
@@ -1088,7 +1088,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/fai/v1/queries/optical_network_info"
+                  uri indicating value "/fai/v1/queries/optical_network_info"
                ;
                from the MEC_APP entity
             }
@@ -1125,7 +1125,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/queries/optical_network_info"
+                  uri indicating value "/fai/v1/queries/optical_network_info"
                   query_parameters containing
                      onuId indicating value UNKNOWN_VALUE
                   ; 
@@ -1165,7 +1165,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/subscriptions"
+                  uri indicating value "/fai/v1/subscriptions"
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      subscription indicating value any_value
@@ -1206,7 +1206,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "/fai/v1/subscriptions"
+                  uri indicating value "/fai/v1/subscriptions"
                ;
                from the MEC_APP entity
             }
@@ -1243,7 +1243,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/fai/v1/subscriptions"
+                  uri indicating value "/fai/v1/subscriptions"
                ;
                from the MEC_APP entity
             }
@@ -1280,7 +1280,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/subscriptions"
+                  uri indicating value "/fai/v1/subscriptions"
                   query_parameters containing
                      subscription_type indicating value UNKNOWN_VALUE
                   ; 
@@ -1320,7 +1320,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "fai/v1/subscriptions" 
+                  uri indicating value "fai/v1/subscriptions" 
                   body containing
                      OnuAlarmSubscription containing 
                         // Unknown value should trigger an error response.
@@ -1364,7 +1364,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iPOST containing
-                  Uri indicating value "fai/v1/subscriptions" 
+                  uri indicating value "fai/v1/subscriptions" 
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType indicating value "OnuAlarmSubscription", 
@@ -1407,7 +1407,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a POST containing
-                  Uri indicating value "fai/v1/subscriptions" 
+                  uri indicating value "fai/v1/subscriptions" 
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType indicating value "OnuAlarmSubscription", 
@@ -1453,7 +1453,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -1493,7 +1493,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -1533,7 +1533,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/fai/v1/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -1574,7 +1574,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
                   body containing
                      OnuAlarmSubscription containing 
                      // Wrong parameter name should trigger an error response.
@@ -1621,7 +1621,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iPUT containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType set to "OnuAlarmSubscription"
@@ -1667,7 +1667,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType set to "OnuAlarmSubscription"
@@ -1713,7 +1713,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/fai/v1/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}",
+                  uri indicating value "/fai/v1/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}",
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType set to "OnuAlarmSubscription"
@@ -1759,8 +1759,8 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
-                  If_Match indicating value INVALID_ETAG, 
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}",
+                  if_match indicating value INVALID_ETAG, 
                   body containing
                      OnuAlarmSubscription containing 
                         subscriptionType set to "OnuAlarmSubscription"
@@ -1805,7 +1805,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a iDELETE containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -1845,7 +1845,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a DELETE containing
-                  Uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -1885,7 +1885,7 @@ Package plat_mp1_fixed_access_info{
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "/fai/v1/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
+                  uri indicating value "/fai/v1/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/Notifications/PlatAppSubscriptions.tplan2 b/Test Purposes/Plat/Mp1/Notifications/PlatAppSubscriptions.tplan2
new file mode 100644
index 0000000000000000000000000000000000000000..a8e74c60a2d026be215323a306b192c2eba6427c
--- /dev/null
+++ b/Test Purposes/Plat/Mp1/Notifications/PlatAppSubscriptions.tplan2	
@@ -0,0 +1,557 @@
+/*
+Copyright (c) ETSI 2018.
+
+This software is subject to copyrights owned by ETSI. Non-exclusive permission
+is hereby granted, free of charge, to copy, reproduce and amend this file
+under the following conditions: It is provided "as is", without warranty of any
+kind, expressed or implied.
+
+ETSI shall never be liable for any claim, damages, or other liability arising
+from its use or inability of use.This permission does not apply to any documentation
+associated with this file for which ETSI keeps all rights reserved. The present
+copyright notice shall be included in all copies of whole or part of this
+file and shall not imply any sub-license right.
+*/
+
+Package plat_app_subscriptions {
+
+   import all from MEC_Common;
+
+
+   /*
+    * Application Subscriptions (APPSUB)
+    */
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_001_OK"
+
+      Test objective
+         "Check that the IUT responds with a list of subscriptions for notifications
+         on services availability when queried by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.6.3.1",
+         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/Mp1SubscriptionLinkList"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vGET containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.6.3.1
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "200 OK"
+                  body containing
+                     SubscriptionLinkList set to any_value
+                  ;
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_002_OK"
+
+      Test objective
+         "Check that the IUT acknowledges the subscription by a MEC Application
+         to notifications on service availability events"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.6.3.4",
+         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/SerAvailabilityNotificationSubscription"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_SERVICES
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6.2
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vPOST containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  body containing
+                     AppTerminationNotificationSubscription containing
+                        subscriptionType indicating value "AppTerminationNotificationSubscription",
+                        callbackReference indicating value some_uri
+                     ;
+                  ;
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.6.3.4
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "201 Created",
+                  Location set to LOCATION,
+                  body containing
+                     AppTerminationNotificationSubscription containing
+                        subscriptionType set to "AppTerminationNotificationSubscription",
+                        callbackReference set to some_uri
+                     ;
+                  ;
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_003_OK"
+
+      Test objective
+         "Check that the IUT responds with the information on a specific subscription
+         when queried by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.5.3.1",
+         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/SerAvailabilityNotificationSubscription"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ; and
+         the IUT entity having a subscriptions containing
+            subscription_id indicating value SUBSCRIPTION_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vGET containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.5.3.1
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "200 OK"
+                  body containing
+                     AppTerminationNotificationSubscription containing
+                        subscriptionType set to "AppTerminationNotificationSubscription"
+                     ;
+                  ;
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_004_OK"
+
+      Test objective
+         "Check that the IUT acknowledges the unsubscribe from service availability event notifications
+         when commanded by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.5.3.5"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ; and
+         the IUT entity having a subscriptions containing
+            subscription_id indicating value SUBSCRIPTION_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vDELETE containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.5.3.5
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "204 No Content"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_001_BI"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         an unauthorised request is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.6.3.1"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a GET containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.6.3.1
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "403 Forbidden"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_002_NF"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         a request for an unknown URI is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.6.3.1"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity "not" having a apps_instance containing
+            instance_id indicating value NON_EXISTENT_APP_INSTANCE_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vGET containing
+                  uri indicating value "mec_app_support/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/subscriptions"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.6.3.1
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "404 Not Found"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_003_BR"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         a request with incorrect parameters is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.6.3.4"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_SERVICES
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6.2
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vPOST containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  body containing
+                     AppTerminationNotificationSubscription containing
+                        // Unknown value should trigger an error response.
+                        subscriptionType indicating value INVALID_SUBSCRIPTION,
+                        callbackReference indicating value some_uri
+                     ;
+                  ;
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.6.3.4
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "400 Bad Request"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_004_BI"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         an unauthorised request is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.6.3.4",
+         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/SerAvailabilityNotificationSubscription"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_SERVICES
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6.2
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a POST containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  body containing
+                     subscriptionType indicating value "SerAvailabilityNotificationSubscription",
+                     callbackReference indicating value some_uri
+                  ;
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.6.3.4
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "403 Forbidden"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_005_BI"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         an unauthorised request is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.5.3.1"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ; and
+         the IUT entity having a subscriptions containing
+            subscription_id indicating value SUBSCRIPTION_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a GET containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.5.3.1
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "403 Forbidden"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_006_NF"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         a request for an URI that cannot be mapped to a valid resource URI
+         is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.5.3.1"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ; and
+         the IUT entity "not" having a subscriptions containing
+            subscription_id indicating value NON_EXISTENT_SUBSCRIPTION_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vGET containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.5.3.1
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "404 Not Found"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_007_BI"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         an unauthorised request is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.5.3.5"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity having a apps_instance containing
+            instance_id indicating value APP_INSTANCE_ID
+         ; and
+         the IUT entity having a subscriptions containing
+            subscription_id indicating value SUBSCRIPTION_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a DELETE containing
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.5.3.5
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "403 Forbidden"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+
+
+   Test Purpose {
+      TP Id "TP_MEC_PLAT_APPSUB_008_NF"
+
+      Test objective
+         "Check that the IUT responds with an error when
+         a request for an URI that cannot be mapped to a valid resource URI
+         is sent by a MEC Application"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.5.3.5"
+
+      Config Id Config_MEC_1
+
+      PICS Selection PIC_MEC_PLAT and PIC_NOTIFICATIONS
+
+      Initial conditions  with {
+         the IUT entity being_in idle_state and
+         the IUT entity "not" having a apps_instance containing
+            instance_id indicating value NON_EXISTENT_APP_INSTANCE_ID
+         ; and
+         the IUT entity having a subscriptions containing
+            subscription_id indicating value SUBSCRIPTION_ID
+         ;
+      }
+
+      // MEC 011, clause 5.2.6
+      Expected behaviour
+         ensure that {
+            when {
+               the IUT entity receives a vDELETE containing
+                  uri indicating value "mec_app_support/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+               ;
+               from the MEC_APP entity
+            }
+            then {
+               // MEC 011, clause 7.5.3.5
+               the IUT entity sends a HTTP_RESPONSE containing
+                  status_code set to "404 Not Found"
+               ;
+               to the MEC_APP entity
+            }
+         }
+   }
+}
diff --git a/Test Purposes/Plat/Mp1/Notifications/PlatNotifications.tplan2 b/Test Purposes/Plat/Mp1/Notifications/PlatSrvSubscriptions.tplan2
similarity index 86%
rename from Test Purposes/Plat/Mp1/Notifications/PlatNotifications.tplan2
rename to Test Purposes/Plat/Mp1/Notifications/PlatSrvSubscriptions.tplan2
index 1ef75c001ada0c061fb8ba3c37672c88a13c9913..7a47dc214b756e003552516fe346df8342fbded9 100644
--- a/Test Purposes/Plat/Mp1/Notifications/PlatNotifications.tplan2	
+++ b/Test Purposes/Plat/Mp1/Notifications/PlatSrvSubscriptions.tplan2	
@@ -13,22 +13,22 @@ copyright notice shall be included in all copies of whole or part of this
 file and shall not imply any sub-license right.
 */
 
-Package plat_notifications {
+Package plat_service_subscriptions {
 
    import all from MEC_Common;
 
 
    /*
-    * Notifications (NTF)
+    * Service Subscriptions (SRVSUB)
     */
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_001_OK"
+      TP Id "TP_MEC_PLAT_SRVSUB_001_OK"
 
       Test objective
          "Check that the IUT responds with a list of subscriptions for notifications
          on services availability when queried by a MEC Application"
 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.6.3.1",
+      Reference "ETSI GS MEC 011 V2.0.4, clause7.2.3.2",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/Mp1SubscriptionLinkList"
 
       Config Id Config_MEC_1
@@ -47,12 +47,12 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions"
                ;
                from the MEC_APP entity
             }
             then {
-               // MEC 011, clause 7.6.3.1
+               // MEC 011, clause 7.2.3.2
                the IUT entity sends a HTTP_RESPONSE containing
                   status_code set to "200 OK"
                   body containing
@@ -66,7 +66,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_002_OK"
+      TP Id "TP_MEC_PLAT_SRVSUB_002_OK"
 
       Test objective
          "Check that the IUT acknowledges the subscription by a MEC Application
@@ -91,9 +91,9 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions"
                   body containing
-                     AppTerminationNotificationSubscription containing
+                     SerAvailabilityNotificationSubscription containing
                         subscriptionType indicating value "SerAvailabilityNotificationSubscription",
                         callbackReference indicating value some_uri
                      ;
@@ -120,7 +120,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_003_OK"
+      TP Id "TP_MEC_PLAT_SRVSUB_003_OK"
 
       Test objective
          "Check that the IUT responds with the information on a specific subscription
@@ -148,7 +148,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -169,7 +169,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_004_OK"
+      TP Id "TP_MEC_PLAT_SRVSUB_004_OK"
 
       Test objective
          "Check that the IUT acknowledges the unsubscribe from service availability event notifications
@@ -196,7 +196,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -212,7 +212,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_001_BI"
+      TP Id "TP_MEC_PLAT_SRVSUB_001_BI"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -236,7 +236,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions"
                ;
                from the MEC_APP entity
             }
@@ -251,7 +251,7 @@ Package plat_notifications {
    }
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_002_NF"
+      TP Id "TP_MEC_PLAT_SRVSUB_002_NF"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -275,7 +275,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/subscriptions"
+                  uri indicating value "mec_service_mgmt/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/subscriptions"
                ;
                from the MEC_APP entity
             }
@@ -291,7 +291,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_003_BR"
+      TP Id "TP_MEC_PLAT_SRVSUB_003_BR"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -315,11 +315,13 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions"
                   body containing
-                     // Unknown value should trigger an error response.
-                     subscriptionType indicating value INVALID_SUBSCRIPTION,
-                     callbackReference indicating value some_uri
+                     SerAvailabilityNotificationSubscription containing
+                        // Unknown value should trigger an error response.
+                        subscriptionType indicating value INVALID_SUBSCRIPTION,
+                        callbackReference indicating value some_uri
+                     ;
                   ;
                ;
                from the MEC_APP entity
@@ -336,7 +338,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_004_BI"
+      TP Id "TP_MEC_PLAT_SRVSUB_004_BI"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -361,7 +363,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a POST containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions"
                   body containing
                      subscriptionType indicating value "SerAvailabilityNotificationSubscription",
                      callbackReference indicating value some_uri
@@ -381,7 +383,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_005_BI"
+      TP Id "TP_MEC_PLAT_SRVSUB_005_BI"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -408,7 +410,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -424,7 +426,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_006_NF"
+      TP Id "TP_MEC_PLAT_SRVSUB_006_NF"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -452,7 +454,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions/{NON_EXISTENT_SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -468,7 +470,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_007_BI"
+      TP Id "TP_MEC_PLAT_SRVSUB_007_BI"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -495,7 +497,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a DELETE containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
@@ -511,7 +513,7 @@ Package plat_notifications {
 
 
    Test Purpose {
-      TP Id "TP_MEC_PLAT_NTF_008_NF"
+      TP Id "TP_MEC_PLAT_SRVSUB_008_NF"
 
       Test objective
          "Check that the IUT responds with an error when
@@ -539,7 +541,7 @@ Package plat_notifications {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "mec_app_support/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
+                  uri indicating value "mec_service_mgmt/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/subscriptions/{SUBSCRIPTION_ID}"
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/RadioNode/PlatRadioNodeLocation.tplan2 b/Test Purposes/Plat/Mp1/RadioNode/PlatRadioNodeLocation.tplan2
index 91db9e27790c3742a181f716babff452f630eaef..e66e6aafa13011f89f5ac36c5d5c8e40afc395f0 100644
--- a/Test Purposes/Plat/Mp1/RadioNode/PlatRadioNodeLocation.tplan2	
+++ b/Test Purposes/Plat/Mp1/RadioNode/PlatRadioNodeLocation.tplan2	
@@ -47,7 +47,7 @@ Package plat_radio_node_location_lookup {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "location/v2/zones/{ZONE_ID}/accessPoints",
+                  uri indicating value "location/v2/zones/{ZONE_ID}/accessPoints",
                   query_parameters containing
                      zoneId indicating value ZONE_ID
                   ;
diff --git a/Test Purposes/Plat/Mp1/AppSAQ/PlatAppServices.tplan2 b/Test Purposes/Plat/Mp1/SAQ/PlatAppServices.tplan2
similarity index 90%
rename from Test Purposes/Plat/Mp1/AppSAQ/PlatAppServices.tplan2
rename to Test Purposes/Plat/Mp1/SAQ/PlatAppServices.tplan2
index 5b72f13ce2ba354d727c52df7cff3434776cc741..44b2d14aae91d9f2a007d254aba8ad283c49d008 100644
--- a/Test Purposes/Plat/Mp1/AppSAQ/PlatAppServices.tplan2	
+++ b/Test Purposes/Plat/Mp1/SAQ/PlatAppServices.tplan2	
@@ -47,7 +47,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services"
                ;
                from the MEC_APP entity
             }
@@ -95,9 +95,11 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services",
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services",
                   body containing
-                     serName indicating value SERVICE_NAME
+                     ServiceInfo containing
+                        serName indicating value SERVICE_NAME
+                     ;
                   ;
                ;
                from the MEC_APP_Registrant entity
@@ -162,7 +164,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}"
                ;
                from the MEC_APP entity
             }
@@ -212,10 +214,12 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
-                     version indicating value NEW_VERSION
+                     ServiceInfo containing
+                        version indicating value NEW_VERSION
+                     ;
                   ;
                ;
                from the MEC_APP entity
@@ -261,7 +265,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services"
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      instance_id indicating value any_value
@@ -305,7 +309,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services"
                ;
                from the MEC_APP entity
             }
@@ -346,7 +350,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/services"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/services"
                ;
                from the MEC_APP entity
             }
@@ -388,10 +392,12 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services",
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services",
                   body containing
-                     // Wrong parameter name should trigger an error response.
-                     Name indicating value SERVICE_NAME
+                     ServiceInfo containing
+                        // Wrong parameter name should trigger an error response.
+                        Name indicating value SERVICE_NAME
+                     ;
                   ;
                ;
                from the MEC_APP_Registrant entity
@@ -434,7 +440,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a POST containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services",
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services",
                   body containing
                      serName indicating value SERVICE_NAME
                   ;
@@ -479,9 +485,11 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/services",
+                  uri indicating value "/mec_service_mgmt/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/services",
                   body containing
-                     serName indicating value SERVICE_NAME
+                     ServiceInfo containing
+                        serName indicating value SERVICE_NAME
+                     ;
                   ;
                ;
                from the MEC_APP_Registrant entity
@@ -525,7 +533,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}"
                ;
                from the MEC_APP entity
             }
@@ -568,7 +576,7 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{NON_EXISTENT_SERVICE_ID}"
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{NON_EXISTENT_SERVICE_ID}"
                ;
                from the MEC_APP entity
             }
@@ -611,11 +619,13 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
-                     // Wrong parameter name should trigger an error response.
-                     a_version indicating value NEW_VERSION
+                     ServiceInfo containing
+                        // Wrong parameter name should trigger an error response.
+                        a_version indicating value NEW_VERSION
+                     ;
                   ;
                ;
                from the MEC_APP entity
@@ -659,8 +669,8 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
                      version indicating value NEW_VERSION
                   ;
@@ -706,10 +716,12 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{NON_EXISTENT_SERVICE_ID}",
-                  If_Match indicating value PROPER_ETAG,
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{NON_EXISTENT_SERVICE_ID}",
+                  if_match indicating value PROPER_ETAG,
                   body containing
-                     version indicating value NEW_VERSION
+                     ServiceInfo containing
+                        version indicating value NEW_VERSION
+                     ;
                   ;
                ;
                from the MEC_APP entity
@@ -753,10 +765,12 @@ Package plat_app_services {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
-                  If_Match indicating value INVALID_ETAG,
+                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
+                  if_match indicating value INVALID_ETAG,
                   body containing
-                     version indicating value NEW_VERSION
+                     ServiceInfo containing
+                        version indicating value NEW_VERSION
+                     ;
                   ;
                ;
                from the MEC_APP entity
diff --git a/Test Purposes/Plat/Mp1/Timing/PlatTiming.tplan2 b/Test Purposes/Plat/Mp1/Timing/PlatTiming.tplan2
index 089db23391ee92ad99dd1017e02bac30cb6548bd..e32bb02d176939dafb50870fdfdf315f7c7961fc 100644
--- a/Test Purposes/Plat/Mp1/Timing/PlatTiming.tplan2	
+++ b/Test Purposes/Plat/Mp1/Timing/PlatTiming.tplan2	
@@ -28,7 +28,7 @@ Package plat_timing {
          "Check that the IUT responds with timing capabilities 
          when queried by a MEC Application"
       
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.7.3.1",
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.7.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/TimingCaps"
       
       Config Id Config_MEC_1
@@ -44,7 +44,7 @@ Package plat_timing {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/timing/timing_caps"
+                  uri indicating value "mec_app_support/v1/timing/timing_caps"
                ;
                from the MEC_APP entity
             }
@@ -69,7 +69,7 @@ Package plat_timing {
          "Check that the IUT responds with current time
          when queried by a MEC Application"
       
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.8.3.1",
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.8.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/CurrentTime"
 
       Config Id Config_MEC_1
@@ -85,7 +85,7 @@ Package plat_timing {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/timing/current_time"
+                  uri indicating value "mec_app_support/v1/timing/current_time"
                ;
                from the MEC_APP entity
             }
@@ -110,7 +110,7 @@ Package plat_timing {
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
       
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.7.3.1"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.7.3.1"
       
       Config Id Config_MEC_1
       
@@ -125,7 +125,7 @@ Package plat_timing {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_app_support/v1/timing/timing_caps"
+                  uri indicating value "mec_app_support/v1/timing/timing_caps"
                ;
                from the MEC_APP entity
             }
@@ -147,7 +147,7 @@ Package plat_timing {
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
       
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.8.3.1"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.8.3.1"
 
       Config Id Config_MEC_1
       
@@ -162,7 +162,7 @@ Package plat_timing {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_app_support/v1/timing/current_time"
+                  uri indicating value "mec_app_support/v1/timing/current_time"
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/TrafficRules/PlatTrafficRules.tplan2 b/Test Purposes/Plat/Mp1/TrafficRules/PlatTrafficRules.tplan2
index 5155b11d8a817980c2fefbdf6a1018d4add10f30..c755ecdafb20f2325f6f9a30d6c891a3b42c666b 100644
--- a/Test Purposes/Plat/Mp1/TrafficRules/PlatTrafficRules.tplan2	
+++ b/Test Purposes/Plat/Mp1/TrafficRules/PlatTrafficRules.tplan2	
@@ -12,27 +12,27 @@ associated with this file for which ETSI keeps all rights reserved. The present
 copyright notice shall be included in all copies of whole or part of this
 file and shall not imply any sub-license right.
 */
- 
+
 Package plat_traffic_rules {
-   
+
    import all from MEC_Common;
-   
+
 
    /*
     * Traffic rules (TFR)
     */
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_001_OK"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with a list of available traffic rules
          when queried by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.10.3.1",
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.10.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/TrafficRule"
-      
+
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -47,7 +47,7 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules" 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules"
                ;
                from the MEC_APP entity
             }
@@ -69,16 +69,16 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_002_OK"
-      
-      Test objective 
-         "Check that the IUT responds with the information on a specific traffic rule 
+
+      Test objective
+         "Check that the IUT responds with the information on a specific traffic rule
          when queried by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.11.3.1",
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.11.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/TrafficRule"
 
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -96,7 +96,7 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}" 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}"
                ;
                from the MEC_APP entity
             }
@@ -118,16 +118,16 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_003_OK"
-      
-      Test objective 
-         "Check that the IUT updates a specific traffic rule 
+
+      Test objective
+         "Check that the IUT updates a specific traffic rule
          when commanded by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.11.3.2",
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.11.3.2",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/TrafficRule"
 
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -145,8 +145,8 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      TrafficRule containing
                         action indicating value "DROP"
@@ -174,15 +174,15 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_001_BI"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.10.3.1"
-      
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.10.3.1"
+
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -197,7 +197,7 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules" 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules"
                ;
                from the MEC_APP entity
             }
@@ -214,15 +214,15 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_002_NF"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with an error when
          a request for an unknown URI is sent by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.10.3.1"
-      
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.10.3.1"
+
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -237,7 +237,7 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_app_support/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/traffic_rules" 
+                  uri indicating value "mec_app_support/v1/applications/{NON_EXISTENT_APP_INSTANCE_ID}/traffic_rules"
                ;
                from the MEC_APP entity
             }
@@ -254,15 +254,15 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_003_BR"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with an error when
          a request with incorrect parameters is sent by a MEC Application"
- 
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.11.3.2"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.11.3.2"
 
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -280,8 +280,8 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG 
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      TrafficRule containing
                         // Invalid parameter value should trigger an error response.
@@ -304,15 +304,15 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_004_BI"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.11.3.2"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.11.3.2"
 
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -330,8 +330,8 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      action indicating value "DROP"
                   ;
@@ -351,15 +351,15 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_005_NF"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with an error when
          a request for an unknown URI is sent by a MEC Application"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.11.3.2"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.11.3.2"
 
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -377,8 +377,8 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{NON_EXISTENT_TRAFFIC_RULE_ID}",
-                  If_Match indicating value PROPER_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{NON_EXISTENT_TRAFFIC_RULE_ID}",
+                  if_match indicating value PROPER_ETAG
                   body containing
                      TrafficRule containing
                         action indicating value "DROP"
@@ -400,15 +400,15 @@ Package plat_traffic_rules {
 
    Test Purpose {
       TP Id "TP_MEC_PLAT_TFR_006_PF"
-      
-      Test objective 
+
+      Test objective
          "Check that the IUT responds with an error when
          a request sent by a MEC Application doesn't comply with a required condition"
-      
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.11.3.2"
+
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.11.3.2"
 
       Config Id Config_MEC_1
-      
+
       PICS Selection PIC_MEC_PLAT and PIC_SERVICES
 
       Initial conditions  with {
@@ -426,8 +426,8 @@ Package plat_traffic_rules {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
-                  If_Match indicating value INVALID_ETAG
+                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/traffic_rules/{TRAFFIC_RULE_ID}",
+                  if_match indicating value INVALID_ETAG
                   body containing
                      TrafficRule containing
                         action indicating value "DROP"
diff --git a/Test Purposes/Plat/Mp1/Transport/PlatTransport.tplan2 b/Test Purposes/Plat/Mp1/Transport/PlatTransport.tplan2
index 3528cb4e7ec0266b95f77a7c20d04eb02486aa51..a61a1c5a0a189d525ae601012018a9a3febe410b 100644
--- a/Test Purposes/Plat/Mp1/Transport/PlatTransport.tplan2	
+++ b/Test Purposes/Plat/Mp1/Transport/PlatTransport.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 plat_mp1_transport{
+Package plat_transport {
    
    import all from MEC_Common;
    
@@ -28,7 +28,7 @@ Package plat_mp1_transport{
          "Check that the IUT responds with a list of available transports
          when queried by a MEC Application"
       
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.9.3.1",
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.9.3.1",
          "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/TransportInfo"
       
       Config Id Config_MEC_1
@@ -44,7 +44,7 @@ Package plat_mp1_transport{
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mec_service_mgmt/v1/transports"
+                  uri indicating value "mec_service_mgmt/v1/transports"
                ;
                from the MEC_APP entity
             }
@@ -71,7 +71,7 @@ Package plat_mp1_transport{
          "Check that the IUT responds with an error when
          an unauthorised request is sent by a MEC Application"
       
-      Reference "ETSI GS MEC 011 V2.0.4, clause 7.9.3.1"
+      Reference "ETSI GS MEC 011 V2.0.9, clause 7.9.3.1"
       
       Config Id Config_MEC_1
       
@@ -86,7 +86,7 @@ Package plat_mp1_transport{
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mec_service_mgmt/v1/transports"
+                  uri indicating value "mec_service_mgmt/v1/transports"
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2 b/Test Purposes/Plat/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2
index 7102e2f1bec9da94013834316c9066ae32ec4421..19e85308e674c2d6adfb51cb4a85991b50d58270 100644
--- a/Test Purposes/Plat/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeAreaSubscription/PlatUeAreaSubscription.tplan2	
@@ -44,7 +44,7 @@ Package plat_ue_area_subscription {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "location/v2/subscriptions/area/circle",
+                  uri indicating value "location/v2/subscriptions/area/circle",
                   body containing
                      circleNotificationSubscription containing 
                         clientCorrelator indicating value CLIENT_ID, 
@@ -71,7 +71,7 @@ Package plat_ue_area_subscription {
                and
                // MEC 013, clause 7.3.11.3
                the IUT entity sends a vPOST containing
-                  Uri indicating value CALLBACK_URL,
+                  uri indicating value CALLBACK_URL,
                   body containing
                      subscriptionNotification containing
                         terminalLocation containing
@@ -110,7 +110,7 @@ Package plat_ue_area_subscription {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "location/v2/subscriptions/area/circle/{SUBSCRIPTION_ID}" 
+                  uri indicating value "location/v2/subscriptions/area/circle/{SUBSCRIPTION_ID}" 
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2 b/Test Purposes/Plat/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2
index 38e40c8aee9787e674e5c53a90245ef1e2544ed5..f64b939b6f78af16c9fb0aa5d3fd0ee043e59742 100644
--- a/Test Purposes/Plat/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeDistanceLookup/PlatUeDistanceLookup.tplan2	
@@ -43,7 +43,7 @@ Package plat_ue_distance_lookup {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "location/v2/queries",
+                  uri indicating value "location/v2/queries",
                   query_parameters containing
                      address indicating value any_value,
                      latitude indicating value any_value,
diff --git a/Test Purposes/Plat/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2 b/Test Purposes/Plat/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2
index 385f55d5825cf3d48e85062139119f92bc44855b..3392817e9dec6c14102f83941a53978cf258a78d 100644
--- a/Test Purposes/Plat/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeDistanceSubscription/PlatUeDistanceSubscription.tplan2	
@@ -44,7 +44,7 @@ Package plat_ue_distance_subscription {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "location/v2/subscriptions/distance",
+                  uri indicating value "location/v2/subscriptions/distance",
                   body containing
                      distanceNotificationSubscription containing
                         clientCorrelator indicating value CLIENT_ID, 
@@ -112,7 +112,7 @@ Package plat_ue_distance_subscription {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "location/v2/subscriptions/distance/{SUBSCRIPTION_ID}" 
+                  uri indicating value "location/v2/subscriptions/distance/{SUBSCRIPTION_ID}" 
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/UeIdentity/PlatUeIdentity.tplan2 b/Test Purposes/Plat/Mp1/UeIdentity/PlatUeIdentity.tplan2
index e8595eabdbb0dbdb5854a9b01782f554c44c983b..8254e1d9b8ecacfd8a232359032057dc92687104 100644
--- a/Test Purposes/Plat/Mp1/UeIdentity/PlatUeIdentity.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeIdentity/PlatUeIdentity.tplan2	
@@ -48,7 +48,7 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
                   query_parameters containing
                      ueIdentityTag indicating value UE_IDENTITY_TAG
                   ;
@@ -101,8 +101,8 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
-                   If_Match indicating value PROPER_ETAG, 
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+                   if_match indicating value PROPER_ETAG, 
                   body containing
                      ueIdentityTagsList containing
                         ueIdentityTags containing
@@ -163,8 +163,8 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
-                  If_Match indicating value PROPER_ETAG, 
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+                  if_match indicating value PROPER_ETAG, 
                   body containing
                      ueIdentityTagsList containing
                         ueIdentityTags containing 
@@ -222,7 +222,7 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
                   query_parameters containing
                      // Wrong parameter name should trigger an error response.
                      ueTag indicating value UE_IDENTITY_TAG
@@ -266,7 +266,7 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
                   query_parameters containing
                      ueIdentityTag indicating value UE_IDENTITY_TAG
                   ;
@@ -310,7 +310,7 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "ui/v1/{NON_EXISTENT_APP_INSTANCE_ID}/ue_identity_tag_info",
+                  uri indicating value "ui/v1/{NON_EXISTENT_APP_INSTANCE_ID}/ue_identity_tag_info",
                   query_parameters containing
                      ueIdentityTag indicating value UE_IDENTITY_TAG
                   ;
@@ -354,8 +354,8 @@ Package plat_ue_identity {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
-x                  If_Match indicating value PROPER_ETAG, 
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+x                  if_match indicating value PROPER_ETAG, 
                   body containing
                      ueIdentityTagsList containing
                         ueIdentityTags containing 
@@ -404,8 +404,8 @@ x                  If_Match indicating value PROPER_ETAG,
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
-                  If_Match indicating value PROPER_ETAG, 
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+                  if_match indicating value PROPER_ETAG, 
                   body containing
                      ueIdentityTagsList containing
                         ueIdentityTags containing 
@@ -454,8 +454,8 @@ x                  If_Match indicating value PROPER_ETAG,
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "ui/v1/{NON_EXISTENT_APP_INSTANCE_ID}/ue_identity_tag_info",
-x                  If_Match indicating value PROPER_ETAG, 
+                  uri indicating value "ui/v1/{NON_EXISTENT_APP_INSTANCE_ID}/ue_identity_tag_info",
+x                  if_match indicating value PROPER_ETAG, 
                   body containing
                      ueIdentityTagsList containing
                         ueIdentityTags containing 
@@ -504,8 +504,8 @@ x                  If_Match indicating value PROPER_ETAG,
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
-x                  If_Match indicating value INVALID_ETAG, 
+                  uri indicating value "ui/v1/{APP_INSTANCE_ID}/ue_identity_tag_info",
+x                  if_match indicating value INVALID_ETAG, 
                   body containing
                      ueIdentityTagsList containing
                         ueIdentityTags containing 
diff --git a/Test Purposes/Plat/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2 b/Test Purposes/Plat/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2
index 92172e2ead9ea99207c8cc6b14c624d1e5350b27..9264f53f20c0e54b41f6baead65c903bae75633c 100644
--- a/Test Purposes/Plat/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeInformationLookup/PlatUeInformationLookup.tplan2	
@@ -49,7 +49,7 @@ Package plat_ue_information_lookup {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "location/v2/users",
+                  uri indicating value "location/v2/users",
                   query_parameters containing
                      zoneId indicating value ZONE_ID
                   ;
diff --git a/Test Purposes/Plat/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2 b/Test Purposes/Plat/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2
index 98ea422847ecc9fe8f154b64acd70833a06e46ca..c5a30061cf42238f8fdec5faf6a061b18cc0712d 100644
--- a/Test Purposes/Plat/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeInformationSubscription/PlatUeInformationSubscription.tplan2	
@@ -44,7 +44,7 @@ Package plat_ue_information_subscription {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "location/v2/subscriptions/zonalTraffic" 
+                  uri indicating value "location/v2/subscriptions/zonalTraffic" 
                   body containing
                      zonalTrafficSubscription containing
                         clientCorrelator indicating value CLIENT_ID, 
@@ -110,7 +110,7 @@ Package plat_ue_information_subscription {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "location/v2/subscriptions/zonalTraffic/{SUBSCRIPTION_ID}" 
+                  uri indicating value "location/v2/subscriptions/zonalTraffic/{SUBSCRIPTION_ID}" 
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2 b/Test Purposes/Plat/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2
index 64f51cacfc111b6abbaae3d9830c0bc87f8006e6..0cd290ccbb0cb8b7682a9bfcd4ca63fb32e20be5 100644
--- a/Test Purposes/Plat/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeLocationLookup/PlatUeLocationLookup.tplan2	
@@ -47,7 +47,7 @@ Package plat_ue_location_lookup {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "location/v2/users",
+                  uri indicating value "location/v2/users",
                   query_parameters containing
                      zoneId indicating value ZONE_ID
                   ;
diff --git a/Test Purposes/Plat/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2 b/Test Purposes/Plat/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2
index cbca4de7f9c3118b9145d338940bd6875e7fd5f6..1aefbbaad5bdeb0c1ab0718663239290d9b1dfc3 100644
--- a/Test Purposes/Plat/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeLocationSubscription/PlatUeLocationSubscription.tplan2	
@@ -44,7 +44,7 @@ Package plat_ue_location_subscription {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "location/v2/subscriptions/userTracking" 
+                  uri indicating value "location/v2/subscriptions/userTracking" 
                   body containing
                      userTrackingSubscription containing
                         clientCorrelator indicating value CLIENT_ID, 
@@ -110,7 +110,7 @@ Package plat_ue_location_subscription {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "location/v2/subscriptions/userTracking/{SUBSCRIPTION_ID}" 
+                  uri indicating value "location/v2/subscriptions/userTracking/{SUBSCRIPTION_ID}" 
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Plat/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2 b/Test Purposes/Plat/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2
index 7ab3b8667e9f5b5bd33661851150e9158f177f5b..4b5c3e471783307242fd3bda9bb824a0f3e6275f 100644
--- a/Test Purposes/Plat/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2	
+++ b/Test Purposes/Plat/Mp1/UeTrackingSubscription/PlatUeTrackingSubscription.tplan2	
@@ -45,7 +45,7 @@ Package plat_ue_tracking_subscription {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "location/v2/subscriptions/periodic" 
+                  uri indicating value "location/v2/subscriptions/periodic" 
                   body containing
                      periodicNotificationSubscription containing
                         clientCorrelator indicating value CLIENT_ID, 
@@ -72,7 +72,7 @@ Package plat_ue_tracking_subscription {
                and
                // MEC 013, clause 7.3.8.3
                the IUT entity sends a vPOST containing
-                  Uri indicating value CALLBACK_URL 
+                  uri indicating value CALLBACK_URL 
                   body containing
                      subscriptionNotification containing
                         terminalLocation containing
@@ -111,7 +111,7 @@ Package plat_ue_tracking_subscription {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "location/v2/subscriptions/periodic/{SUBSCRIPTION_ID}" 
+                  uri indicating value "location/v2/subscriptions/periodic/{SUBSCRIPTION_ID}" 
                ;
                from the MEC_APP entity
             }
diff --git a/Test Purposes/Sys/Mx2/UeAppCtx/SysUeAppsContext.tplan2 b/Test Purposes/Sys/Mx2/UeAppCtx/SysUeAppsContext.tplan2
index 19db695ddf01a8dd54131118229c925b46289f77..01902686dd801915e6d5605c07b39f42a513ef9f 100644
--- a/Test Purposes/Sys/Mx2/UeAppCtx/SysUeAppsContext.tplan2	
+++ b/Test Purposes/Sys/Mx2/UeAppCtx/SysUeAppsContext.tplan2	
@@ -45,7 +45,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "mx2/v2/app_contexts",
+                  uri indicating value "mx2/v2/app_contexts",
                   body containing
                      AppContext containing
                         appInfo containing
@@ -101,7 +101,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
                   body containing
                      AppContext containing
                         callbackReference indicating value some_uri
@@ -146,7 +146,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
                ;
                from the UE_APP entity
             }
@@ -184,7 +184,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vPOST containing
-                  Uri indicating value "mx2/v2/app_contexts",
+                  uri indicating value "mx2/v2/app_contexts",
                   body containing
                      AppContext containing
                         appInfo containing
@@ -230,7 +230,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a iPOST containing
-                  Uri indicating value "mx2/v2/app_contexts",
+                  uri indicating value "mx2/v2/app_contexts",
                   body containing
                      AppContext containing
                         appInfo containing
@@ -275,7 +275,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a POST containing
-                  Uri indicating value "mx2/v2/app_contexts",
+                  uri indicating value "mx2/v2/app_contexts",
                   body containing
                      AppContext containing
                         appInfo containing
@@ -323,7 +323,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
                   body containing
                      AppContext containing
                         // A parameter not legible for update should trigger an error response.
@@ -370,7 +370,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a iPUT containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}",
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}",
                   body containing
                      AppContext containing
                         callbackReference indicating value some_uri
@@ -416,7 +416,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a PUT containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
                   body containing
                      AppContext containing
                         callbackReference indicating value some_uri
@@ -462,7 +462,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vPUT containing
-                  Uri indicating value "mx2/v2/app_contexts/{NON_EXISTENT_CONTEXT_ID}",
+                  uri indicating value "mx2/v2/app_contexts/{NON_EXISTENT_CONTEXT_ID}",
                   body containing
                      AppContext containing
                         callbackReference indicating value some_uri
@@ -507,7 +507,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a iDELETE containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
                ;
                from the UE_APP entity
             }
@@ -547,7 +547,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a DELETE containing
-                  Uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{CONTEXT_ID}"
                ;
                from the UE_APP entity
             }
@@ -587,7 +587,7 @@ Package sys_mx2_ue_apps_context {
          ensure that {
             when {
                the IUT entity receives a vDELETE containing
-                  Uri indicating value "mx2/v2/app_contexts/{NON_EXISTENT_CONTEXT_ID}"
+                  uri indicating value "mx2/v2/app_contexts/{NON_EXISTENT_CONTEXT_ID}"
                ;
                from the UE_APP entity
             }
diff --git a/Test Purposes/Sys/Mx2/UeApps/SysUeApplications.tplan2 b/Test Purposes/Sys/Mx2/UeApps/SysUeApplications.tplan2
index f97b4f161a06c8f4d6b1b3c7975fa72431abac25..f0757de688626f186621d6dc4a3082bd0dedcd34 100644
--- a/Test Purposes/Sys/Mx2/UeApps/SysUeApplications.tplan2	
+++ b/Test Purposes/Sys/Mx2/UeApps/SysUeApplications.tplan2	
@@ -48,7 +48,7 @@ Package sys_mx2_ue_applications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mx2/v2/app_list",
+                  uri indicating value "mx2/v2/app_list",
                   query_parameters containing
                      appName indicating value APP_NAME
                   ;
@@ -98,7 +98,7 @@ Package sys_mx2_ue_applications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mx2/v2/app_list",
+                  uri indicating value "mx2/v2/app_list",
                   query_parameters containing
                      appName indicating value APP_NAME,
                      // Wrong name should trigger an error response.
@@ -143,7 +143,7 @@ Package sys_mx2_ue_applications {
          ensure that {
             when {
                the IUT entity receives a iGET containing
-                  Uri indicating value "mx2/v2/app_list",
+                  uri indicating value "mx2/v2/app_list",
                   query_parameters containing
                      appName indicating value APP_NAME
                   ;
@@ -186,7 +186,7 @@ Package sys_mx2_ue_applications {
          ensure that {
             when {
                the IUT entity receives a GET containing
-                  Uri indicating value "mx2/v2/app_list",
+                  uri indicating value "mx2/v2/app_list",
                   query_parameters containing
                      appName indicating value APP_NAME
                   ;
@@ -229,7 +229,7 @@ Package sys_mx2_ue_applications {
          ensure that {
             when {
                the IUT entity receives a vGET containing
-                  Uri indicating value "mx2/v2/app_list",
+                  uri indicating value "mx2/v2/app_list",
                   query_parameters containing
                      // Wrong value should trigger an error response.
                      appName indicating value UNKNOWN_APP_NAME