diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
index b35a94824506d2913510f8d562fa8d43d23c5ee8..1ed4cd04f78e3bfd3b3538db3687852a127bfa69 100644
--- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
+++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
@@ -55,9 +55,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              AlarmNotification:
-                $ref: "definitions/SOL005NSFaultManagementNotification_def.yaml#/definitions/AlarmNotification"
+            $ref: "definitions/SOL005NSFaultManagementNotification_def.yaml#/definitions/AlarmNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -131,9 +129,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              AlarmClearedNotification:
-                $ref: "definitions/SOL005NSFaultManagementNotification_def.yaml#/definitions/AlarmClearedNotification"
+            $ref: "definitions/SOL005NSFaultManagementNotification_def.yaml#/definitions/AlarmClearedNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -170,7 +166,7 @@ paths:
             The response body shall be empty.
           headers:
             WWW-Authenticate:
-              type: "string"
+              type: string
               description: >
                 Challenge if the corresponding HTTP request has not provided
                 authorization, or error details if the corresponding HTTP request
@@ -206,9 +202,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              AlarmListRebuiltNotification:
-                $ref: "definitions/SOL005NSFaultManagementNotification_def.yaml#/definitions/AlarmListRebuiltNotification"
+            $ref: "definitions/SOL005NSFaultManagementNotification_def.yaml#/definitions/AlarmListRebuiltNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
index 8e24b87438872b3fa4d70d5a4559c76cddb618c6..31e62343b47f800d6b2237e372f2ae792945cf63 100644
--- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
+++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
@@ -58,9 +58,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              NsLcmOperationOccurrenceNotification:
-                $ref: "definitions/SOL005NSLifecycleManagementNotification_def.yaml#/definitions/NsLcmOperationOccurrenceNotification"
+            $ref: "definitions/SOL005NSLifecycleManagementNotification_def.yaml#/definitions/NsLcmOperationOccurrenceNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -146,9 +144,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              NsIdentifierCreationNotification:
-                $ref: "definitions/SOL005NSLifecycleManagementNotification_def.yaml#/definitions/NsIdentifierCreationNotification"
+            $ref: "definitions/SOL005NSLifecycleManagementNotification_def.yaml#/definitions/NsIdentifierCreationNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -234,9 +230,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              NsIdentifierDeletionNotification:
-                $ref: "definitions/SOL005NSLifecycleManagementNotification_def.yaml#/definitions/NsIdentifierDeletionNotification"
+            $ref: "definitions/SOL005NSLifecycleManagementNotification_def.yaml#/definitions/NsIdentifierDeletionNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index 01ea470ad1fbabb16da9aa68c5bf268c06a3879c..c86d30eb29276c8145c776a7ab2ee874e4da10e8 100644
--- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -57,9 +57,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              VnfPackageOnboardingNotification:
-                $ref: "definitions/SOL005VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageOnboardingNotification"
+            $ref: "definitions/SOL005VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageOnboardingNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -134,9 +132,7 @@ paths:
           in: body
           required: true
           schema:
-            properties:
-              VnfPackageChangeNotification:
-                $ref: "definitions/SOL005VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageChangeNotification"
+            $ref: "definitions/SOL005VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageChangeNotification"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.