diff --git a/Mp1.json b/Mp1.json
index ae8a10e8cee593059cd8f5d16515c94a5cc68a60..ca1b0ab64f81f80d5bed1fab66d82272d74a09f5 100644
--- a/Mp1.json
+++ b/Mp1.json
@@ -120,17 +120,6 @@
       "type": "string",
       "format": "uri"
     },
-    "Path.SubscriptionType": {
-      "name": "subscriptionType",
-      "description": "Represents a subscription type to the notifications from the MEC platform.",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "enum": [
-        "SerAvailabilityNotificationSubscription",
-        "AppTerminationNotificationSubscription"
-      ]
-    },
     "Path.ServiceId": {
       "name": "serviceId",
       "description": "Represents a MEC service instance.",
@@ -570,21 +559,18 @@
         }
       }
     },
-    "/applications/{appInstanceId}/subscriptions/{subscriptionType}/{subscriptionId}": {
+    "/applications/{appInstanceId}/subscriptions/AppTerminationNotificationSubscription/{subscriptionId}": {
       "parameters": [
         {
           "$ref": "#/parameters/Path.AppInstanceId"
         },
-        {
-          "$ref": "#/parameters/Path.SubscriptionType"
-        },
         {
           "$ref": "#/parameters/Path.SubscriptionId"
         }
       ],
       "get": {
         "description": "The GET method requests information about a subscription for this requestor. Upon success, the response contains entity body with the subscription for the requestor.",
-        "operationId": "ApplicationsSubscription.GET",
+        "operationId": "AppTerminationSubscription_GET",
         "produces": [
           "application/json"
         ],
@@ -640,7 +626,110 @@
       },
       "delete": {
         "description": "This method deletes a meMp1Subscription. This method is typically used in \"Unsubscribing from service availability event notifications\" procedure.",
-        "operationId": "ApplicationsSubscription.DELETE",
+        "operationId": "AppTerminationSubscription_DELETE",
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "403": {
+            "description": "Forbidden",
+            "schema": {
+              "type": "object",
+              "required": [
+                "ProblemDetails"
+              ],
+              "properties": {
+                "ProblemDetails": {
+                  "$ref": "#/definitions/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "ProblemDetails": {
+                  "$ref": "#/definitions/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/applications/{appInstanceId}/subscriptions/SerAvailabilityNotificationSubscription/{subscriptionId}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/Path.AppInstanceId"
+        },
+        {
+          "$ref": "#/parameters/Path.SubscriptionId"
+        }
+      ],
+      "get": {
+        "description": "The GET method requests information about a subscription for this requestor. Upon success, the response contains entity body with the subscription for the requestor.",
+        "operationId": "SerAvailabilitySubscription_GET",
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "200": {
+            "description": "Upon success, a response body containing the requested subscription is returned.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "SerAvailabilityNotificationSubscription": {
+                  "$ref": "#/definitions/SerAvailabilityNotificationSubscription"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "ProblemDetails": {
+                  "$ref": "#/definitions/ProblemDetails"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "Forbidden",
+            "schema": {
+              "type": "object",
+              "required": [
+                "ProblemDetails"
+              ],
+              "properties": {
+                "ProblemDetails": {
+                  "$ref": "#/definitions/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "ProblemDetails": {
+                  "$ref": "#/definitions/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "This method deletes a meMp1Subscription. This method is typically used in \"Unsubscribing from service availability event notifications\" procedure.",
+        "operationId": "SerAvailabilitySubscription_DELETE",
         "produces": [
           "application/json"
         ],
@@ -1009,12 +1098,6 @@
                       "endpoint": {
                         "uris": [
                           "/meMp1/service/EntryPoint"
-                        ],
-                        "addresses": [
-                          {
-                            "host": "192.0.2.0",
-                            "port": 8080
-                          }
                         ]
                       },
                       "security": {
@@ -1122,9 +1205,6 @@
                     "protocol": "HTTP",
                     "version": "2.0",
                     "endpoint": {
-                      "uris": [
-                        "/meMp1/service/EntryPoint"
-                      ],
                       "addresses": [
                         {
                           "host": "192.0.2.0",
@@ -2271,9 +2351,6 @@
     "SecurityInfo": {
       "description": "This type represents security information related to a transport",
       "type": "object",
-      "required": [
-        "oAuth2Info"
-      ],
       "properties": {
         "oAuth2Info": {
           "$ref": "#/definitions/SecurityInfo.OAuth2Info"
diff --git a/Mp1.yaml b/Mp1.yaml
index c24c3ada4c710edbd2d724db09149683088e41ce..8994287cad71cd43b622026fc81947a4ef5e0930 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -90,15 +90,6 @@ parameters:
     required: true
     type: string
     format: uri
-  Path.SubscriptionType:
-    name: subscriptionType
-    description: Represents a subscription type to the notifications from the MEC platform.
-    in: path
-    required: true
-    type: string
-    enum:
-      - SerAvailabilityNotificationSubscription
-      - AppTerminationNotificationSubscription
   Path.ServiceId:
     name: serviceId
     description: Represents a MEC service instance.
@@ -389,19 +380,23 @@ paths:
             properties:
               ProblemDetails:
                 $ref: '#/definitions/ProblemDetails'
-  '/applications/{appInstanceId}/subscriptions/{subscriptionType}/{subscriptionId}':
+  '/applications/{appInstanceId}/subscriptions/AppTerminationNotificationSubscription/{subscriptionId}':
     parameters:
       - $ref: '#/parameters/Path.AppInstanceId'
-      - $ref: '#/parameters/Path.SubscriptionType'
       - $ref: '#/parameters/Path.SubscriptionId'
     get:
-      description: 'The GET method requests information about a subscription for this requestor. Upon success, the response contains entity body with the subscription for the requestor.'
-      operationId: ApplicationsSubscription.GET
+      description: >-
+        The GET method requests information about a subscription for this
+        requestor. Upon success, the response contains entity body with the
+        subscription for the requestor.
+      operationId: AppTerminationSubscription_GET
       produces:
         - application/json
       responses:
         '200':
-          description: 'Upon success, a response body containing the requested subscription is returned.'
+          description: >-
+            Upon success, a response body containing the requested subscription
+            is returned.
           schema:
             type: object
             properties:
@@ -431,8 +426,83 @@ paths:
               ProblemDetails:
                 $ref: '#/definitions/ProblemDetails'
     delete:
-      description: This method deletes a meMp1Subscription. This method is typically used in "Unsubscribing from service availability event notifications" procedure.
-      operationId: ApplicationsSubscription.DELETE
+      description: >-
+        This method deletes a meMp1Subscription. This method is typically used
+        in "Unsubscribing from service availability event notifications"
+        procedure.
+      operationId: AppTerminationSubscription_DELETE
+      produces:
+        - application/json
+      responses:
+        '204':
+          description: No Content
+        '403':
+          description: Forbidden
+          schema:
+            type: object
+            required:
+              - ProblemDetails
+            properties:
+              ProblemDetails:
+                $ref: '#/definitions/ProblemDetails'
+        '404':
+          description: Not Found
+          schema:
+            type: object
+            properties:
+              ProblemDetails:
+                $ref: '#/definitions/ProblemDetails'
+  '/applications/{appInstanceId}/subscriptions/SerAvailabilityNotificationSubscription/{subscriptionId}':
+    parameters:
+      - $ref: '#/parameters/Path.AppInstanceId'
+      - $ref: '#/parameters/Path.SubscriptionId'
+    get:
+      description: >-
+        The GET method requests information about a subscription for this
+        requestor. Upon success, the response contains entity body with the
+        subscription for the requestor.
+      operationId: SerAvailabilitySubscription_GET
+      produces:
+        - application/json
+      responses:
+        '200':
+          description: >-
+            Upon success, a response body containing the requested subscription
+            is returned.
+          schema:
+            type: object
+            properties:
+              SerAvailabilityNotificationSubscription:
+                $ref: '#/definitions/SerAvailabilityNotificationSubscription'
+        '400':
+          description: Bad Request
+          schema:
+            type: object
+            properties:
+              ProblemDetails:
+                $ref: '#/definitions/ProblemDetails'
+        '403':
+          description: Forbidden
+          schema:
+            type: object
+            required:
+              - ProblemDetails
+            properties:
+              ProblemDetails:
+                $ref: '#/definitions/ProblemDetails'
+        '404':
+          description: Not Found
+          schema:
+            type: object
+            properties:
+              ProblemDetails:
+                $ref: '#/definitions/ProblemDetails'
+    delete:
+      description: >-
+        This method deletes a meMp1Subscription. This method is typically used
+        in "Unsubscribing from service availability event notifications"
+        procedure.
+      operationId: SerAvailabilitySubscription_DELETE
       produces:
         - application/json
       responses:
@@ -666,9 +736,6 @@ paths:
                     endpoint:
                       uris:
                         - '/meMp1/service/EntryPoint'
-                      addresses:
-                        - host: '192.0.2.0'
-                          port: 8080
                     security:
                       oAuth2Info:
                         grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
@@ -741,8 +808,6 @@ paths:
                   protocol: 'HTTP'
                   version: '2.0'
                   endpoint:
-                    uris:
-                      - '/meMp1/service/EntryPoint'
                     addresses:
                       - host: '192.0.2.0'
                         port: 8080
@@ -1518,8 +1583,6 @@ definitions:
   SecurityInfo:
     description: This type represents security information related to a transport
     type: object
-    required:
-      - oAuth2Info
     properties:
       oAuth2Info:
         $ref: '#/definitions/SecurityInfo.OAuth2Info'