diff --git a/src/SOL023/CertificateManagement/CertificateManagement.yaml b/src/SOL023/CertificateManagement/CertificateManagement.yaml
index f33f09ce54196df30c4063bbab5e14a3ff3fb27c..06c0a8974781cd2b49412de8145ac4d61362c777 100644
--- a/src/SOL023/CertificateManagement/CertificateManagement.yaml
+++ b/src/SOL023/CertificateManagement/CertificateManagement.yaml
@@ -377,7 +377,7 @@ components:
         Shall be returned when a new "Individual Subject instance" resource and the associated Subject instance
         identifier has been created successfully.
 
-        The response body shall contain a representation of the created Subject instance, as defined in clause 5.6.2.2.
+        The response body shall contain a representation of the created Subject instance, as defined in clause 5.6.4.2.2.
 
         The HTTP response shall include a "Location" HTTP header that contains the resource URI of the created
         Subject instance.
@@ -463,7 +463,7 @@ components:
         Shall be returned when information about zero or more subject instances has been queried successfully.
 
         The response body shall contain in an array the representations of zero or more subject instances, as
-        defined in clause 5.6.b.2.2.
+        defined in clause 5.6.4.2.2.
 
         If the "filter" URI parameter or one of the "all_fields", "fields" (if supported), "exclude_fields"
         (if supported) or "exclude_default" URI parameters was supplied in the request, the data in the response
@@ -754,7 +754,7 @@ components:
 
         The response body shall contain in an array the representations of all active subscriptions
         of the functional block that invokes the method, i.e. zero or more representations of certificate
-        change notification subscriptions as defined in clause 7.7.2.3.
+        change notification subscriptions as defined in clause 7.7.2.2.
 
         If the "filter" URI parameter was supplied in the request, the data in the response body shall have
         been transformed according to the rules specified in clause 5.2.2 of ETSI GS NFV-SOL 013.
diff --git a/src/SOL023/CertificateManagement/definitions/SOL023CertificateManagement_def.yaml b/src/SOL023/CertificateManagement/definitions/SOL023CertificateManagement_def.yaml
index d08137ee4043e28c3d6ba28165e753b5bb0dc675..8a3ab210255662b43bf409272ffa6a537e1be03e 100644
--- a/src/SOL023/CertificateManagement/definitions/SOL023CertificateManagement_def.yaml
+++ b/src/SOL023/CertificateManagement/definitions/SOL023CertificateManagement_def.yaml
@@ -22,9 +22,9 @@ definitions:
       certType:
         description: >
           Indicate the type of target certificate. The possible values are (see note 1):
-            -	MANO certificate
-            -	VNFCI certificate
-            -	VNF OAM certificate
+            -	MANO_certificate
+            -	VNFCI_certificate
+            -	VNF_OAM_certificate
         type: string
         enum:
           - MANO_certificate
@@ -64,8 +64,8 @@ definitions:
         description: >
           This parameter shall be present only if certType is VNFCI certificate or VNF OAM certificate. It indicates the
           mode of certificate management for the target entity. The possible values are:
-            -	direct mode
-            -	delegation mode
+            -	direct_mode
+            -	delegation_mode
           See note 2.
         type: string
         enum:
@@ -99,9 +99,9 @@ definitions:
       certType:
         description: >
           Indicate the type of target certificate. The possible values are (see note 1):
-            -	MANO certificate
-            -	VNFCI certificate
-            -	VNF OAM certificate
+            -	MANO_certificate
+            -	VNFCI_certificate
+            -	VNF_OAM_certificate
         type: string
         enum:
           - MANO_certificate
@@ -141,8 +141,8 @@ definitions:
         description: >
           This parameter shall be present only if certType is VNFCI certificate or VNF OAM certificate. It indicates the
           mode of certificate management for the target entity. The possible values are:
-            -	direct mode
-            -	delegation mode
+            -	direct_mode
+            -	delegation_mode
           See note 2.
         type: string
         enum: