diff --git a/Mp1.json b/Mp1.json
index a3583e3e365d01bf00ccba21fc1c3d7bf37bc535..7e19f604a87cadcdaaa58eb4ca95fbe21b0fc901 100644
--- a/Mp1.json
+++ b/Mp1.json
@@ -92,17 +92,6 @@
       "required": true,
       "type": "string"
     },
-    "Path.SubscriptionType": {
-      "name": "subscriptionType",
-      "description": "Represents a subscription type to the notifications from the mobile edge platform.",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "enum": [
-        "AppTerminationNotificationSubscription",
-        "SerAvailabilityNotificationSubscription"
-      ]
-    },
     "Path.ServiceId": {
       "name": "serviceId",
       "description": "Represents a mobile edge service instance.",
@@ -519,13 +508,113 @@
         }
       }
     },
-    "/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": "AppTerminationSubscription_GET",
+        "produces": [
+          "application/json"
+        ],
+        "responses": {
+          "200": {
+            "description": "Upon success, a response body containing the requested subscription is returned.",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "AppTerminationNotificationSubscription": {
+                  "$ref": "#/definitions/AppTerminationNotificationSubscription"
+                }
+              }
+            }
+          },
+          "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": "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"
@@ -533,7 +622,7 @@
       ],
       "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": "SerAvailabilitySubscription_GET",
         "produces": [
           "application/json"
         ],
@@ -589,7 +678,7 @@
       },
       "delete": {
         "description": "This method deletes a meMp1Subscription. This method is typically used in \"Unsubscribing from service availability event notifications\" procedure.",
-        "operationId": "ApplicationsSubscription_DELETE",
+        "operationId": "SerAvailabilitySubscription_DELETE",
         "produces": [
           "application/json"
         ],
@@ -2006,9 +2095,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 dea0f473806376cb7614aa0ba9f3f50b242ba398..54717914e71c3858b19f7c32e952eb120afbf26f 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -83,17 +83,6 @@ parameters:
     in: path
     required: true
     type: string
-  Path.SubscriptionType:
-    name: subscriptionType
-    description: >-
-      Represents a subscription type to the notifications from the mobile edge
-      platform.
-    in: path
-    required: true
-    type: string
-    enum:
-    - AppTerminationNotificationSubscription
-    - SerAvailabilityNotificationSubscription
   Path.ServiceId:
     name: serviceId
     description: Represents a mobile edge service instance.
@@ -397,17 +386,88 @@ paths:
             properties:
               ProblemDetails:
                 $ref: '#/definitions/ProblemDetails'
-  '/applications/{appInstanceId}/subscriptions/{subscriptionType}/{subscriptionId}':
+  '/applications/{appInstanceId}/subscriptions/AppTerminationNotificationSubscription/{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: AppTerminationSubscription_GET
+      produces:
+        - application/json
+      responses:
+        '200':
+          description: >-
+            Upon success, a response body containing the requested subscription
+            is returned.
+          schema:
+            type: object
+            properties:
+              AppTerminationNotificationSubscription:
+                $ref: '#/definitions/AppTerminationNotificationSubscription'
+        '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: 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.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: SerAvailabilitySubscription_GET
       produces:
         - application/json
       responses:
@@ -448,7 +508,7 @@ paths:
         This method deletes a meMp1Subscription. This method is typically used
         in "Unsubscribing from service availability event notifications"
         procedure.
-      operationId: ApplicationsSubscription_DELETE
+      operationId: SerAvailabilitySubscription_DELETE
       produces:
         - application/json
       responses:
@@ -1473,8 +1533,6 @@ definitions:
   SecurityInfo:
     description: This type represents security information related to a transport
     type: object
-    required:
-      - oAuth2Info
     properties:
       oAuth2Info:
         $ref: '#/definitions/SecurityInfo.OAuth2Info'