diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
index 1623cd6789fac5410a3baea0215321b17a47df18..f6db551c5e59694cad53a915e62e2829deffea6d 100644
--- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
+++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
@@ -89,10 +89,10 @@ paths:
 
         The client can use this method to retrieve information about the alarm list.
       parameters:
-        - name: "filter"
-          in: "query"
+        - name: filter
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
             The NFVO shall support receiving this parameter as part of the URI query string.
@@ -508,10 +508,10 @@ paths:
         Table 8.4.4.3.2-1: URI query parameters supported.
 
       parameters:
-        - name: "filter"
-          in: "query"
+        - name: filter
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
             The NFVO shall support receiving this parameter as part of the URI
diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
index c546d18a5afb214f2ff39e958a6c6d0943599ae4..759cac32416d42e7966de4c0ecc66df047d82df7 100644
--- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
+++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
@@ -192,41 +192,41 @@ paths:
         This method shall support the URI query parameters, request and response data structures, and response codes, as
         specified in the Tables 6.4.2.3.2-1 and 6.4.2.3.2-2.
       parameters:
-        - name: "filter"
-          in: "query"
+        - name: filter
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
-            "Attribute-based filtering expression according to clause 4.3.2.
+            Attribute-based filtering expression according to clause 4.3.2.
             The NFVO shall support receiving this parameter as part of the URI
             query string. The OSS/BSS may supply this parameter.
             All attribute names that appear in the NsInstance and in data types
-            referenced from it shall be supported by the NFVO in the filter expression."
-        - name: "all_fields"
-          in: "query"
+            referenced from it shall be supported by the NFVO in the filter expression.
+        - name: all_fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
-            "Include all complex attributes in the response. See clause 4.3.3 for details.
-            The NFVO shall support this parameter."
-        - name: "fields"
-          in: "query"
+            Include all complex attributes in the response. See clause 4.3.3 for details.
+            The NFVO shall support this parameter.
+        - name: fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             "Complex attributes to be included into the response. See clause 4.3.3 for
             details. The NFVO should support this parameter."          
-        - name: "exclude_fields"
-          in: "query"
+        - name: exclude_fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             "Complex attributes to be excluded from the response. See clause 4.3.3 for
             details. The NFVO should support this parameter."
-        - name: "exclude_default"
-          in: "query"
+        - name: exclude_default
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             "Indicates to exclude the following complex attributes from the response.
             See clause 4.3.3 for details. The NFVO shall support this parameter.
@@ -912,34 +912,34 @@ paths:
         This method shall follow the provisions specified in the Tables 6.4.9.3.2-1 and 6.4.9.3.2-2 for URI query parameters,
         request and response data structures, and response codes.
       parameters:
-        - name: "filter"
-          in: "query"
+        - name: filter
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
             The NFVO shall support receiving this parameter as part of the URI query string.
             The OSS/BSS may supply this parameter.
             All attribute names that appear in the NsLcmOpOcc and in data types referenced
             from it shall be supported by the NFVO in the filter expression.
-        - name: "fields"
-          in: "query"
+        - name: fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Complex attributes to be included into the response. See clause 4.3.3 for details. The
             NFVO should support this parameter.
-        - name: "exclude_fields"
-          in: "query"
+        - name: exclude_fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Complex attributes to be excluded from the response. See clause 4.3.3 for details.
             The NFVO should support this parameter.
-        - name: "exclude_default"
-          in: "query"
+        - name: exclude_default
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Indicates to exclude the following complex attributes from the response. See
             clause 4.3.3 for details. The NFVO shall support this parameter.
diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
index f1d39acc5c724ec88c5dd79b016b238879f83193..16c66a9ccf09ff47115fc428e8dbcbad9f24d44f 100644
--- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
@@ -90,41 +90,41 @@ paths:
         Tables 9.4.2.3.2-1 and 9.4.2.3.2-2 for URI query parameters,
         request and response data structures, and response codes.
       parameters:
-        - name: "filter"
-          in: "query"
+        - name: filter
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
             The NFVO shall support receiving this parameter as part of the URI query string. The
             OSS/BSS may supply this parameter.
             All attribute names that appear in the VnfPkgInfo and in data types referenced from it shall
             be supported by the NFVO in the filter expression.
-        - name: "all_fields"
-          in: "query"
+        - name: all_fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Include all complex attributes in the response. See clause 4.3.3 for details. The NFVO
             shall support this parameter.
-        - name: "fields"
-          in: "query"
+        - name: fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Complex attributes to be included into the response. See clause 4.3.3 for details. The
             NFVO should support this parameter.         
-        - name: "exclude_fields"
-          in: "query"
+        - name: exclude_fields
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Complex attributes to be excluded from the response. See clause 4.3.3 for details. The
             NFVO should support this parameter.
-        - name: "exclude_default"
-          in: "query"
+        - name: exclude_default
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Indicates to exclude the following complex attributes from the response. See clause 4.3.3
             for details.
@@ -1193,10 +1193,10 @@ paths:
         Tables 9.4.7.8.2-1 and 9.4.8.3.2-2 for URI query parameters,
         request and response data structures, and response codes.
       parameters:
-        - name: "filter"
-          in: "query"
+        - name: filter
+          in: query
           required: false
-          type: "string"
+          type: string
           description: >
             Attribute-based filtering expression according to clause 4.3.2.
             The NFVO shall support receiving this filtering parameter as part of the URI query