diff --git a/code/API_definitions/blockchain-public-address-validation.yaml b/code/API_definitions/blockchain-public-address-validation.yaml
index 014040a..c6c1eca 100644
--- a/code/API_definitions/blockchain-public-address-validation.yaml
+++ b/code/API_definitions/blockchain-public-address-validation.yaml
@@ -137,20 +137,20 @@ components:
             One-time challenge generated associated to indicated `blockchainPublicAddress`.
     ErrorInfo:
       type: object
+      required:
+        - status
+        - code
+        - message
       properties:
+        message:
+          type: string
+          description: A human-readable description of what the event represents
         status:
           type: integer
-          description: HTTP status code returned along with this error response
+          description: HTTP response status code
         code:
           type: string
-          description: Code given to this error
-        message:
-          type: string
-          description: Detailed error description
-      required:
-        - status
-        - code
-        - message
+          description: A human-readable code to describe the error
   responses:
     Generic400:
       description: Problem with the client request
diff --git a/code/API_definitions/blockchain-public-address.yaml b/code/API_definitions/blockchain-public-address.yaml
index 5f1525b..9f04452 100644
--- a/code/API_definitions/blockchain-public-address.yaml
+++ b/code/API_definitions/blockchain-public-address.yaml
@@ -355,20 +355,20 @@ components:
             type: string
     ErrorInfo:
       type: object
+      required:
+        - status
+        - code
+        - message
       properties:
+        message:
+          type: string
+          description: A human-readable description of what the event represents
         status:
           type: integer
-          description: HTTP status code returned along with this error response
+          description: HTTP response status code
         code:
           type: string
-          description: Code given to this error
-        message:
-          type: string
-          description: Detailed error description
-      required:
-        - status
-        - code
-        - message
+          description: A human-readable code to describe the error
   responses:
     InvalidArgumentForBlockchain400:
       description: |
diff --git a/code/Test_definitions/blockchain-public-address-bindBlockchainPublicAddress.feature b/code/Test_definitions/blockchain-public-address-bindBlockchainPublicAddress.feature
index 707565d..e2bfd36 100644
--- a/code/Test_definitions/blockchain-public-address-bindBlockchainPublicAddress.feature
+++ b/code/Test_definitions/blockchain-public-address-bindBlockchainPublicAddress.feature
@@ -8,7 +8,7 @@ Feature: CAMARA Blockchain Public Address API, v0.3.0-rc.1 - Operation bindBlock
   # * A phone number and several blockchainPublicAddress in order to be able to perform bindings
   #
   #
-  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address.yaml, version 0.3.0-rc.1
+  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address.yaml
 
   Background: Common bindBlockchainPublicAddress setup
     Given the resource "/blockchain-public-address/v0.3rc1/blockchain-public-addresses"
diff --git a/code/Test_definitions/blockchain-public-address-deleteBlockchainPublicAddress.feature b/code/Test_definitions/blockchain-public-address-deleteBlockchainPublicAddress.feature
index 108389b..7c717dd 100644
--- a/code/Test_definitions/blockchain-public-address-deleteBlockchainPublicAddress.feature
+++ b/code/Test_definitions/blockchain-public-address-deleteBlockchainPublicAddress.feature
@@ -8,7 +8,7 @@ Feature: CAMARA Blockchain Public Address API, v0.3.0-rc.1 - Operation deleteBlo
   # * A phone number with several existing bindings to be able to perform unbindings
   #
   #
-  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address.yaml, version 0.3.0-rc.1
+  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address.yaml
 
   Background: Common deleteBlockchainPublicAddress setup
     Given the resource "/blockchain-public-address/v0.3rc1/blockchain-public-addresses/{id}"
diff --git a/code/Test_definitions/blockchain-public-address-retrieveBlockchainPublicAddress.feature b/code/Test_definitions/blockchain-public-address-retrieveBlockchainPublicAddress.feature
index 102fc66..e16cffa 100644
--- a/code/Test_definitions/blockchain-public-address-retrieveBlockchainPublicAddress.feature
+++ b/code/Test_definitions/blockchain-public-address-retrieveBlockchainPublicAddress.feature
@@ -8,7 +8,7 @@ Feature: CAMARA Blockchain Public Address API, v0.3.0-rc.1 - Operation retrieveB
   # * A phone number with several existing bindings to be able to perform queries
   #
   #
-  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address.yaml, version 0.3.0-rc.1
+  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address.yaml
 
   Background: Common retrieveBlockchainPublicAddress setup
     Given the resource "/blockchain-public-address/v0.3rc1/blockchain-public-addresses/retrieve-blockchains"
diff --git a/code/Test_definitions/blockchain-public-address-validation-createBlockchainPublicAddressValidationNonce.feature b/code/Test_definitions/blockchain-public-address-validation-createBlockchainPublicAddressValidationNonce.feature
index 939cabd..c77bd30 100644
--- a/code/Test_definitions/blockchain-public-address-validation-createBlockchainPublicAddressValidationNonce.feature
+++ b/code/Test_definitions/blockchain-public-address-validation-createBlockchainPublicAddressValidationNonce.feature
@@ -8,7 +8,7 @@ Feature: CAMARA Blockchain Public Address Validation API, v0.1.0-rc.1 - Operatio
   # * A valid blockchainPublicAddress in order to be able to generate nonces
   #
   #
-  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address-validation.yaml, version 0.1.0-rc.1
+  # References to OAS spec schemas refer to schemas specifies in blockchain-public-address-validation.yaml
 
   Background: Common createBlockchainPublicAddressValidationNonce setup
     Given the resource "/blockchain-public-address-validation/v0.1rc1/blockchain-public-addresses"