From 9a40b8760aa308326b8e4e4afd249c616297fd20 Mon Sep 17 00:00:00 2001
From: Pascaline Laure Tchienehom <pascalinelaure.tchienehom@nttdata.com>
Date: Fri, 14 Apr 2023 11:49:31 +0200
Subject: [PATCH] Fix ESPD v3.2.0 with #380 Validation for GitHub ESPD-EDM

Fix ESPD v3.2.0 with #380 Validation for GitHub ESPD-EDM
---
 .../xsl/01-ESPD-common-cl-attributes.xsl      |   18 +-
 validation/ESPDRequest/xsl/ESPD-criterion.xml | 5673 +++++++++--------
 .../xsl/01-ESPD-common-cl-attributes.xsl      |   18 +-
 .../ESPDResponse/xsl/ESPD-criterion.xml       | 5673 +++++++++--------
 .../sch/01-ESPD-common-cl-attributes.sch      |    6 +-
 5 files changed, 5717 insertions(+), 5671 deletions(-)

diff --git a/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl b/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl
index c40e5913..0d5c5758 100644
--- a/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl
+++ b/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl
@@ -522,10 +522,10 @@
 
 		    <!--ASSERT -->
 <xsl:choose>
-         <xsl:when test="(false() or not(@listID != 'CriterionElementType'))"/>
+         <xsl:when test="(false() or not(@listID != 'criterion-element-type'))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="(false() or not(@listID != 'CriterionElementType'))">
+                                test="(false() or not(@listID != 'criterion-element-type'))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
@@ -536,7 +536,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listID = CriterionElementType'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listID = criterion-element-type'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -988,10 +988,10 @@
 
 		    <!--ASSERT -->
 <xsl:choose>
-         <xsl:when test="(false() or not(@listID != 'PropertyGroupType'))"/>
+         <xsl:when test="(false() or not(@listID != 'property-group-type'))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="(false() or not(@listID != 'PropertyGroupType'))">
+                                test="(false() or not(@listID != 'property-group-type'))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
@@ -1002,7 +1002,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listID = PropertyGroupType'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listID = property-group-type'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -1078,10 +1078,10 @@
 
 		    <!--ASSERT -->
 <xsl:choose>
-         <xsl:when test="(false() or not(@listID != 'ResponseDataType'))"/>
+         <xsl:when test="(false() or not(@listID != 'response-data-type'))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="(false() or not(@listID != 'ResponseDataType'))">
+                                test="(false() or not(@listID != 'response-data-type'))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
@@ -1092,7 +1092,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listID = ResponseDataType'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listID = response-data-type'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
diff --git a/validation/ESPDRequest/xsl/ESPD-criterion.xml b/validation/ESPDRequest/xsl/ESPD-criterion.xml
index 7ac99edc..7b789c49 100644
--- a/validation/ESPDRequest/xsl/ESPD-criterion.xml
+++ b/validation/ESPDRequest/xsl/ESPD-criterion.xml
@@ -17,22 +17,22 @@
     <cbc:ProfileExecutionID schemeAgencyID="OP" schemeVersionID="3.2.0"
         >ESPD-EDMv3.2.0</cbc:ProfileExecutionID>
     <!-- The identifier of this document	generally generated by the systems that creates the ESPD -->
-    <cbc:ID schemeAgencyID="DGPE">ESPDREQ-DGPE-e3f1a3d73d</cbc:ID>
+    <cbc:ID schemeAgencyID="DGPE">ESPDREQ-DGPE-267da1aec2</cbc:ID>
     <!-- Indicates whether this document is an original or a copy. In this case the document is the original -->
     <cbc:CopyIndicator>false</cbc:CopyIndicator>
     <!-- The unique identifier for this instance of the document. Copies of this document should have different UUIDs -->
     <cbc:UUID schemeID="ISO/IEC 9834-8:2008 - 4UUID" schemeAgencyID="XXXESPD-SERVICEXXX"
-        schemeVersionID="3.2.0">9b39741a-8641-4879-be82-c624c15d7d2f</cbc:UUID>
+        schemeVersionID="3.2.0">48b84e63-6b61-410f-bf8e-700638318c6a</cbc:UUID>
     <!-- The reference number the contracting authority assigns to this procurement procedure -->
     <cbc:ContractFolderID schemeAgencyID="DGPE">PP.20170419.1024-9</cbc:ContractFolderID>
-    <cbc:IssueDate>2023-03-07+01:00</cbc:IssueDate>
-    <cbc:IssueTime>10:49:23+01:00</cbc:IssueTime>
+    <cbc:IssueDate>2023-04-12+02:00</cbc:IssueDate>
+    <cbc:IssueTime>17:43:52+02:00</cbc:IssueTime>
     <!-- The version of the content of this document. If the document is modified the element cbc:PreviousVersionID should be instantiated -->
     <cbc:VersionID schemeAgencyID="OP" schemeVersionID="3.2.0">3.2.0</cbc:VersionID>
     <!-- The type of the procurement procedure; this information is provided by eForms and the concret notice per procedure. e.g. open = 	
 		In open procedures any interested economic operator may submit a tender in response to a call for competition. -->
-    <cbc:ProcedureCode listID="ProcedureType" listAgencyID="OP" listVersionID="3.2.0"
-        >open</cbc:ProcedureCode>
+    <cbc:ProcedureCode listID="Dummy_ProcedureType" listAgencyID="OP" listVersionID="3.2.0"
+        >Open</cbc:ProcedureCode>
     <cac:ContractingParty>
         <cbc:BuyerProfileURI>DummyValue</cbc:BuyerProfileURI>
         <cac:Party>
@@ -86,125 +86,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">598aefff-28c6-4586-afe2-9ae8efb6c7fa</cbc:ID>
+                        schemeVersionID="3.2.0">5dc453f3-dca2-4571-8374-4ab189f2503e</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">80d0d9d2-2fb8-42d0-b785-ae9ea7b36781</cbc:ID>
+                        schemeVersionID="3.2.0">89af5a35-18af-4331-b194-d81bf37a8e35</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >7216fde1-8317-422c-9cee-4fac2c5c4189</cbc:ID>
+                >5cc654ca-d28b-495d-a90d-6aae3fdc06b4</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">cde460b1-9ade-4e52-8602-26056a1cf54c</cbc:ID>
+                    schemeVersionID="3.2.0">a2ff22b8-461e-4683-8ff7-8c37fe01221a</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c1b19342-ccf5-4e95-814d-243fd80297ac</cbc:ID>
+                        schemeVersionID="3.2.0">86dbbabc-54c0-422e-bf1a-40e2376b7803</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e21fe514-e08f-4fd9-acdf-717e159e9bca</cbc:ID>
+                        schemeVersionID="3.2.0">bb7edfac-20ef-4e99-8ebd-8db525dd43d9</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">855927c9-6313-4a15-a28b-8642c3111bfe</cbc:ID>
+                        schemeVersionID="3.2.0">306b0a66-99da-4138-bed7-4dba14c4be28</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">484b688f-7de9-4c71-b5a3-acde938c6f1a</cbc:ID>
+                        schemeVersionID="3.2.0">42b68c72-d46e-41d6-be05-bf6e0691144c</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5c9588a9-4d05-471c-8797-eb456240a14a</cbc:ID>
+                            schemeVersionID="3.2.0">4ce2ef78-7239-46b9-b00c-a9c633d37018</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6a9e96f3-8581-4229-9c6f-c266dc25ff72</cbc:ID>
+                                >d4af76a7-0b1c-45aa-8525-dca9f70e8198</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -214,29 +214,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5616debc-48c4-48eb-966e-a928eb3bdd84</cbc:ID>
+                    schemeVersionID="3.2.0">f177fa0d-f1cf-4dd3-8ba7-a627b76cc049</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4fee2c79-d60a-4a37-9f5c-1a548b3600e3</cbc:ID>
+                        schemeVersionID="3.2.0">8d9844bc-50d5-4b7d-85ff-998464a4679b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -268,125 +268,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">56dadea9-7e75-490b-901e-8ddbf271e09d</cbc:ID>
+                        schemeVersionID="3.2.0">75d7e6d4-47ca-4ce2-913d-9dc5a7469a7c</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4c5a5ed3-5ecc-4a52-92a4-66d6943b99a1</cbc:ID>
+                        schemeVersionID="3.2.0">cfaf5d03-a76a-4ed6-b160-2edfe9b21bf0</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >77b97f29-5867-4c0b-bcc8-704f15a4442f</cbc:ID>
+                >7fb92d7f-b349-4b10-b3ef-95cc79a69092</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f9a62470-b9ca-4aa1-b3ae-cfab7530b6b0</cbc:ID>
+                    schemeVersionID="3.2.0">15cb5567-9800-400d-bbc7-5db4e559cd31</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ca3fe54d-3ae4-46bb-8eeb-96852c5a2419</cbc:ID>
+                        schemeVersionID="3.2.0">e662fabf-c2af-4482-89bb-a5ca37644294</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e69abbcf-418a-47dd-a384-d9ae07aa60d1</cbc:ID>
+                        schemeVersionID="3.2.0">c1a81e0d-e61b-4bdd-9676-c9386f13763d</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">679c889f-6db5-43cd-b297-2d1fac283c30</cbc:ID>
+                        schemeVersionID="3.2.0">aadb1b87-2f53-496a-b138-b3ac56fd86bc</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3ac60757-0132-45a4-b579-d345e8378be5</cbc:ID>
+                        schemeVersionID="3.2.0">62092407-c1d9-4067-aaee-ba7d4f6d3877</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">10c89a88-9399-4ce5-ad15-fdeda0b66a38</cbc:ID>
+                            schemeVersionID="3.2.0">23213dfe-ef01-432d-b32f-376e20184f5e</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >dc3e0233-fc20-4619-bc58-0a48172eb8ba</cbc:ID>
+                                >4824afbd-3e9c-4c34-94cc-f93a859c70fc</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -396,29 +396,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">3cc0433b-d2de-4271-88f1-e39c889714ee</cbc:ID>
+                    schemeVersionID="3.2.0">709af0b8-5c9f-4b5c-bdb0-ab4c8931f981</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4b566d3b-6d41-415f-b5d1-84b06f45e585</cbc:ID>
+                        schemeVersionID="3.2.0">c75896aa-996d-4bf4-9a4c-75fa0639782b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -446,125 +446,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8b38582d-84d6-4510-97d4-93df206a357a</cbc:ID>
+                        schemeVersionID="3.2.0">2498e379-889d-42da-b717-0fdf350b1716</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c76fd416-47ad-4c18-ac09-ed2cbe9d9e6f</cbc:ID>
+                        schemeVersionID="3.2.0">2c121c08-9f8d-4599-9e21-d5fd980aa827</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >36ac3a88-5d60-4fe8-977e-5776a7ed6d70</cbc:ID>
+                >d6e61980-dc61-440c-bdb2-1ad60d07dcb9</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">28b728a3-0460-4ad8-8011-a1ddefcca9e8</cbc:ID>
+                    schemeVersionID="3.2.0">08a45dd6-d289-40a8-9560-bc0d5de1974f</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3d01b222-bf88-4b8c-9228-770436fc0bd4</cbc:ID>
+                        schemeVersionID="3.2.0">ab726227-2bf5-4bf0-a0d7-195b477d9e3f</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cd1213d8-8eb1-42db-9f07-1003e0e60108</cbc:ID>
+                        schemeVersionID="3.2.0">cd7439ba-9fdb-4131-868c-fcaeea89b653</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bbe07c80-2f28-4727-9ced-99b565ad3dbd</cbc:ID>
+                        schemeVersionID="3.2.0">cf916ca9-b57f-44b0-8b70-ff8458bda662</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ade81de9-3388-412c-bae4-764499a6af14</cbc:ID>
+                        schemeVersionID="3.2.0">2687549d-b040-4dd5-8079-58520edac97e</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">13828459-caad-43b7-b2c0-06eba19b8721</cbc:ID>
+                            schemeVersionID="3.2.0">5851bd21-84b2-4540-9106-208d66c15f7f</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1d96ac9a-3d4f-49ac-a9ea-c3d55a314b23</cbc:ID>
+                                >8778d320-1ef1-4d62-b89b-b41e0632391f</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -574,29 +574,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">30adb1ac-1905-4c12-a54f-a4212c2c7850</cbc:ID>
+                    schemeVersionID="3.2.0">b3360bfc-8951-4b5c-a8ef-975daa2828fb</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e8a7723-9b66-433a-989f-1708e6109fcc</cbc:ID>
+                        schemeVersionID="3.2.0">4c40f5d0-8a5b-4ceb-95e2-bbf2ca9a9dab</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -626,125 +626,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6ae67392-bc26-4e84-8cb1-297c3ac09538</cbc:ID>
+                        schemeVersionID="3.2.0">897d0663-5423-4616-ba5e-b821357f8302</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7a08afd2-409b-4faa-8d0b-eae69149ed8a</cbc:ID>
+                        schemeVersionID="3.2.0">68dc7309-2789-49f7-ad4f-92254ee12f0b</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >73ed7f28-349e-47aa-9869-a872006b0e56</cbc:ID>
+                >cb577798-a46b-4d17-a089-56ba73bcf750</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">17139b9c-3a53-4bed-a262-c995d39189d5</cbc:ID>
+                    schemeVersionID="3.2.0">cdc6734e-66d4-4481-b16b-da061c3ddaad</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1bc0c100-2f04-4189-9826-e0c4f40ad912</cbc:ID>
+                        schemeVersionID="3.2.0">6b16cae4-e209-4f5d-b980-9c4494f55b7e</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2f6f6880-8ffe-4722-9f3c-3fd896b74f4d</cbc:ID>
+                        schemeVersionID="3.2.0">a3f4be19-2dd6-4144-a759-c9d6faef26c9</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e997bfcb-f2a7-4265-99ec-0908b0ce4110</cbc:ID>
+                        schemeVersionID="3.2.0">6bab74fd-dd74-403b-ba12-ae1fc48e9201</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">68d93dee-8e48-4d43-89dd-1e268e1b1b31</cbc:ID>
+                        schemeVersionID="3.2.0">92710423-2f0d-42f4-a8ab-ac159767deb7</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5296074c-bfbe-4193-9197-43cd78b53575</cbc:ID>
+                            schemeVersionID="3.2.0">997f5625-1d9d-4bb8-bf97-f4532b8bf727</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >d9569ad9-1388-4e4c-995e-2bd3a8dc9177</cbc:ID>
+                                >44ab50fd-668c-44ce-a423-e7242cfa4269</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -754,29 +754,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">31b251b5-9ea7-464d-92c1-d28014160373</cbc:ID>
+                    schemeVersionID="3.2.0">6afbcff1-751b-47f6-a889-f1218546a221</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5d6bd9d5-5e02-4c23-b1e2-908223115cad</cbc:ID>
+                        schemeVersionID="3.2.0">149a7896-f8fc-45e0-9771-3392b8c6543c</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -806,125 +806,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">92c39e1b-e320-4baf-8dd8-96a0db325c7e</cbc:ID>
+                        schemeVersionID="3.2.0">e8d3a058-c249-419e-897f-9d6a26cfd8ab</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2e039e0f-8589-49f3-b168-e88763430f89</cbc:ID>
+                        schemeVersionID="3.2.0">52ade97a-d64a-4791-a954-3b743f6a5a1b</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >c4197f4a-9f0f-4088-bc33-974e1be8e742</cbc:ID>
+                >77051e64-ab2a-498a-af14-554777ed0896</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0278acda-37e2-4acc-a4f9-703c5f80d631</cbc:ID>
+                    schemeVersionID="3.2.0">37be6104-427d-47b7-a24b-bfbcfa44ab67</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">64723b78-c876-4bc0-b837-99a18de50f75</cbc:ID>
+                        schemeVersionID="3.2.0">1e71e076-9256-4408-a787-bc9e53678368</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">09ad0eb0-10e5-4278-9c11-b76396d1cec2</cbc:ID>
+                        schemeVersionID="3.2.0">ee0ccef8-abcc-4d52-a66f-b5cd6ebd86c7</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">12cfc762-6312-4278-9710-fb57d22cc775</cbc:ID>
+                        schemeVersionID="3.2.0">cc413d9b-69f8-46bc-8379-5292ec2920be</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e6bbea4-281f-40fe-9681-7f08831605d2</cbc:ID>
+                        schemeVersionID="3.2.0">4135b0e8-2972-4ff9-be29-f5279b14da6d</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">8c17d544-fdb0-473d-b2a6-be6e84017511</cbc:ID>
+                            schemeVersionID="3.2.0">12bed2ca-6e0f-49da-966f-0774ef6095d8</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e3b8b501-302c-42c7-aae5-68d51a360457</cbc:ID>
+                                >957d8d72-78e9-4f06-ba6f-52eace91195e</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -934,29 +934,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f9d20e26-15cf-4788-aaab-3154cfec22a4</cbc:ID>
+                    schemeVersionID="3.2.0">369862c9-512a-4898-be13-e0b55773e835</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">37295cf2-a448-49f2-afd8-14525a1a24bf</cbc:ID>
+                        schemeVersionID="3.2.0">89a3cb70-2d2c-4913-ac3a-ce4feaa37558</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -986,125 +986,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bc6f04ab-7a3d-4634-865a-31c75d2c9647</cbc:ID>
+                        schemeVersionID="3.2.0">899b3999-48a8-4916-bd88-fb81768b29d0</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f28ad9aa-dd84-401d-802f-21aa23674ff9</cbc:ID>
+                        schemeVersionID="3.2.0">8bbe192e-1882-4327-b81b-cd2a6fce00dc</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >94447eb2-36c6-4786-b1f9-c980a4434fdf</cbc:ID>
+                >34df53ef-51b0-4507-bc65-b8256f653051</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">220c1186-888f-4dfa-9cd0-68bc28808b4a</cbc:ID>
+                    schemeVersionID="3.2.0">58e1f4fe-9f84-4d63-9e17-ea098dae81d4</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d56ca523-0baa-4fe8-b427-25f2a8cbe14d</cbc:ID>
+                        schemeVersionID="3.2.0">b965299b-6298-4f7a-befc-7d52d6fed2bd</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8925952a-e28c-48b0-a95d-4aa7698c587c</cbc:ID>
+                        schemeVersionID="3.2.0">b11be1ac-a69a-4bb0-97ed-a1a6ede56b7d</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a86b45cc-02b6-4ed3-88fd-7cbf689391fe</cbc:ID>
+                        schemeVersionID="3.2.0">be9feae6-9a1e-41b4-9f6a-9174b3603c04</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">743d007c-7a38-48ca-81ff-0b530d7c1d6f</cbc:ID>
+                        schemeVersionID="3.2.0">b1e6fc26-d54b-4fd6-b962-0d313d6ef929</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">72f83fcd-4af2-407b-812a-b858dc04d054</cbc:ID>
+                            schemeVersionID="3.2.0">37a5a832-1042-48ac-8323-6911ef1f9f69</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c2da2566-bded-425c-9a16-401256906e16</cbc:ID>
+                                >bb3d1833-a468-46ac-9a1c-02aa79fb0d9b</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1114,29 +1114,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">250f1031-d62b-45d5-9847-a31fd68eec72</cbc:ID>
+                    schemeVersionID="3.2.0">cd3a68fc-9cac-497a-be07-7db74afa5c5d</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">edb7bb01-c660-4d19-bafe-d96c6b611078</cbc:ID>
+                        schemeVersionID="3.2.0">a6d4d91a-a41c-4279-afa4-54626b53c720</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1161,54 +1161,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">48015ec7-3ad1-4986-b32c-c403c98b5654</cbc:ID>
+                        schemeVersionID="3.2.0">236dffe7-26c5-4bf1-96cf-21f9d89b37d6</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d119ccca-4f1b-489e-84ff-f9912403ffa2</cbc:ID>
+                        schemeVersionID="3.2.0">2578d66d-0fe7-4ab8-bbde-d70e7ba7ffd9</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >e7f5d261-f262-4991-92a4-a6d737061fc5</cbc:ID>
+                >56fc054a-b5b8-4c6d-b15b-1a0884896d83</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">16e95264-7b72-4def-9102-479b6d06517b</cbc:ID>
+                    schemeVersionID="3.2.0">3ded0637-05a2-4373-b859-3fc0c50c3f53</cbc:ID>
                 <cbc:Description>Threshold</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1218,11 +1218,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e2537922-24bc-462f-a876-9a72cb73fe8c</cbc:ID>
+                    schemeVersionID="3.2.0">045ce86c-77b0-4d64-8666-d29052364b64</cbc:ID>
                 <cbc:Description>Additional Information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1234,107 +1234,109 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >098fd3cc-466e-4233-af1a-affe09471bce</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">db15bc0f-4166-49a5-88d4-1771f82799ad</cbc:ID>
+                        schemeVersionID="3.2.0">9499cf68-6eca-4717-962d-c6de592310b7</cbc:ID>
                     <cbc:Description>Your answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >f8499787-f9f8-4355-95e2-9784426f4d7b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">0c1c75d4-bf1b-4508-8c2b-b03a5585e09e</cbc:ID>
+                            schemeVersionID="3.2.0">dc2d8baa-135a-4ec9-a623-7db044d32858</cbc:ID>
                         <cbc:Description>Country or member state concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">CODE_COUNTRY</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">40e4fa3d-b4e7-41d0-b0c2-d137905cdc6c</cbc:ID>
+                            schemeVersionID="3.2.0">1d909609-f0f5-4a1b-9b52-0ebb1ab312a4</cbc:ID>
                         <cbc:Description>Amount concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7c2aec9f-4876-4c33-89e6-2ab6d6cf5d02</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3a0b647f-ac16-4eb8-9be8-98696339049a</cbc:ID>
+                                >30b02a19-c9c9-4530-98cb-ba7e24dbb412</cbc:ID>
                             <cbc:Description>Has this breach of obligations been established by
                                 means other than a judicial or administrative
                                 decision?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >3cb7abf1-662a-4756-b61c-7bc716c1fafc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >f0c096f9-f9ef-4f71-8f36-78ef60febe5c</cbc:ID>
+                                    >d429f71b-58d4-4232-9e60-22d8107e8059</cbc:ID>
                                 <cbc:Description>Please describe which means were
                                     used</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                         </cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >fc57e473-d63e-4a04-b589-dcf81cab8052</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >266d74aa-ec26-47ba-882d-34992857ff70</cbc:ID>
+                                    >db8f38f5-8403-4795-81dd-ced0be6219ef</cbc:ID>
                                 <cbc:Description>Has the economic operator fulfilled its obligations
                                     by paying or entering into a binding arrangement with a view to
                                     paying the taxes contributions due, including, where applicable,
                                     any interest accrued or fines?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >6c3609e1-9add-4fa9-9409-62ce72ae4548</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >7384b059-e66f-4ba6-8691-8ffe53184adb</cbc:ID>
+                                        >9e41a477-7ef4-4c23-af82-44d8ca4f77a6</cbc:ID>
                                     <cbc:Description>Please describe them</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DESCRIPTION</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1343,49 +1345,50 @@
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >c882afa4-6971-4b00-8970-0c283eb122cc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONFALSE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >9ca9cd41-d086-4a58-b8e8-bd5b552670f0</cbc:ID>
+                                    >e24cab38-631a-40e1-8703-900630a2c68a</cbc:ID>
                                 <cbc:Description>If this breach of obligations was established
                                     through a judicial or administrative decision, was this decision
                                     final and binding?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >815422d6-f8a1-418a-8bf0-3524f7c8f721</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >126876b5-1941-4193-899c-5aeed3feda62</cbc:ID>
+                                        >ecb2345c-f1b2-4188-9392-335681ea05ba</cbc:ID>
                                     <cbc:Description>Please indicate the date of conviction or
                                         decision</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DATE</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >becaa987-d5dd-458c-9e14-b28bb59f4291</cbc:ID>
+                                        >72c09b27-49c4-4096-9e82-82b289e305bf</cbc:ID>
                                     <cbc:Description>In case of a conviction insofar as established
                                         directly therein, the length of the period of
                                         exclusion</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >PERIOD</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1397,29 +1400,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">24940789-14e0-41d3-950a-66b8f7af7593</cbc:ID>
+                        schemeVersionID="3.2.0">4e94827a-6851-4770-a642-b6ff8b26b311</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c61d4ae6-d798-4f69-8ce5-8b5135e89add</cbc:ID>
+                            schemeVersionID="3.2.0">fc133aea-c5b4-4790-a1e2-97a5a5845544</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1445,54 +1448,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f0df7426-fb1d-494d-9c94-71fb81780489</cbc:ID>
+                        schemeVersionID="3.2.0">7850172b-c610-4ca9-9859-4e92e7ae025d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7b780a22-d7d6-4908-9e80-115e0015efa1</cbc:ID>
+                        schemeVersionID="3.2.0">f6552141-6a72-40be-8de3-2991181015bb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >65c2a3cf-868d-4290-a9ce-c9059c5c149f</cbc:ID>
+                >0c2c2128-e823-4e36-b8c4-c6108818be34</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">335d68f9-dbf4-42ca-bd2a-5dcaa297c4f8</cbc:ID>
+                    schemeVersionID="3.2.0">cfd71496-e7f7-4464-a492-9dcfbd31ad8f</cbc:ID>
                 <cbc:Description>Threshold</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1502,11 +1505,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">70ceae29-b77c-491b-bd36-17d5a9c7d58e</cbc:ID>
+                    schemeVersionID="3.2.0">db068206-6528-498d-baed-9baa6d7fb9a5</cbc:ID>
                 <cbc:Description>Additional Information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1518,107 +1521,109 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >098fd3cc-466e-4233-af1a-affe09471bce</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d19034bf-77b9-47df-afbe-17988ffda9fd</cbc:ID>
+                        schemeVersionID="3.2.0">6871e8da-09f6-4cae-9ddb-74bc9c4845f2</cbc:ID>
                     <cbc:Description>Your answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >f8499787-f9f8-4355-95e2-9784426f4d7b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6afd5e38-b596-424d-80f0-88ee809e9db7</cbc:ID>
+                            schemeVersionID="3.2.0">f973961d-033b-42e4-bc50-2fb8fe512a03</cbc:ID>
                         <cbc:Description>Country or member state concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">CODE_COUNTRY</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">757a501b-3533-41b5-b6dd-7fbe715414a1</cbc:ID>
+                            schemeVersionID="3.2.0">e61e7b2f-9e92-4636-a08d-e87aa7022e22</cbc:ID>
                         <cbc:Description>Amount concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7c2aec9f-4876-4c33-89e6-2ab6d6cf5d02</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0396ed21-12b3-4799-9fbd-3edce871c4f7</cbc:ID>
+                                >dc7d3af1-76c4-40c6-b3f6-85ce8462d18d</cbc:ID>
                             <cbc:Description>Has this breach of obligations been established by
                                 means other than a judicial or administrative
                                 decision?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >3cb7abf1-662a-4756-b61c-7bc716c1fafc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >74279cde-54ef-40b5-96a5-3940412850da</cbc:ID>
+                                    >5a0c9758-81fc-4dd0-bf72-3f636d90e143</cbc:ID>
                                 <cbc:Description>Please describe which means were
                                     used</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                         </cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >fc57e473-d63e-4a04-b589-dcf81cab8052</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >eabda236-e0ac-46d7-bfe3-f670b137012c</cbc:ID>
+                                    >9f575d72-3860-460e-ad76-af61d2d04bb2</cbc:ID>
                                 <cbc:Description>Has the economic operator fulfilled its obligations
                                     by paying or entering into a binding arrangement with a view to
                                     paying the social security contributions due, including, where
                                     applicable, any interest accrued or fines?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >6c3609e1-9add-4fa9-9409-62ce72ae4548</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >b1286d00-71af-4a26-bbeb-497a7197c261</cbc:ID>
+                                        >6410a37f-b2df-46ce-aade-93f68df45cfe</cbc:ID>
                                     <cbc:Description>Please describe them</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DESCRIPTION</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1627,49 +1632,50 @@
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >c882afa4-6971-4b00-8970-0c283eb122cc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONFALSE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >c071510f-a2ab-4b7d-b2b8-d1c1fb3e95a8</cbc:ID>
+                                    >f3c0d9cc-2c80-4930-92cf-210d75831f0b</cbc:ID>
                                 <cbc:Description>If this breach of obligations was established
                                     through a judicial or administrative decision, was this decision
                                     final and binding?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >815422d6-f8a1-418a-8bf0-3524f7c8f721</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >222f635f-f058-4032-829c-9019454c3377</cbc:ID>
+                                        >f56b5559-62dd-4171-bb77-ad02c4ca44d9</cbc:ID>
                                     <cbc:Description>Please indicate the date of conviction or
                                         decision</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DATE</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >44bb8296-f4da-4ae9-92ee-786627930893</cbc:ID>
+                                        >bf5e3d61-e261-48b8-88b3-3a1fbd43b54b</cbc:ID>
                                     <cbc:Description>In case of a conviction insofar as established
                                         directly therein, the length of the period of
                                         exclusion</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >PERIOD</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1681,29 +1687,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cfc9c608-f9a7-4cca-80de-29a75571d48f</cbc:ID>
+                        schemeVersionID="3.2.0">67fadc99-962c-4563-82ca-1676a90b3f8e</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">aa88fd58-fb60-4c61-b2b6-da322dce566f</cbc:ID>
+                            schemeVersionID="3.2.0">519b3557-80b4-487e-a6ab-71c7f06e12d2</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1729,83 +1735,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5202deba-9828-4606-a9f3-772a0f2d205b</cbc:ID>
+                        schemeVersionID="3.2.0">d50aecec-edcb-4eba-a4de-846dbe8eae58</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">555e2d84-afe4-4f01-8272-cbdd4a1d3b37</cbc:ID>
+                        schemeVersionID="3.2.0">3c5f6c66-ffbf-4c77-9946-e9cd5aebc747</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ee61041e-d040-49ad-bdc9-b9c5f6851edd</cbc:ID>
+                >44c0b595-52a3-4eac-9b44-4457a69f560f</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >976b5acb-c00f-46ca-8f83-5ce6abfdfe43</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ed2d67f3-4cfd-429f-adfc-2f86f4f896c6</cbc:ID>
+                    schemeVersionID="3.2.0">ba101918-8da3-4b6f-ba36-76f999f5523c</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >64a2102c-4af1-4ecb-97b3-0c41907ec0f6</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">359ebb36-d900-4fad-8730-2244d5b213bb</cbc:ID>
+                        schemeVersionID="3.2.0">eb16a5df-675d-49e4-a472-4a9d4ffeb78a</cbc:ID>
                     <cbc:Description>Have you taken measures to demonstrate your reliability
                         (Self-Cleaning)?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ed153f48-4816-47d1-9f26-2380fedf2e42</cbc:ID>
+                            schemeVersionID="3.2.0">568b01a6-1a88-4a09-ade4-7c68c1fd2d24</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1814,29 +1820,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9e148fef-a78f-46c9-b0ae-d8e83ee43e4f</cbc:ID>
+                    schemeVersionID="3.2.0">58656f9e-119e-4741-bd5b-5d4677312ba3</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e962ae18-160e-4c5b-91b4-0997949df4d0</cbc:ID>
+                        schemeVersionID="3.2.0">2ab33ae9-eb59-4d3a-abf3-54ae77c41bd0</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1861,83 +1867,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">51c4cebb-cc21-489c-818e-47a651250813</cbc:ID>
+                        schemeVersionID="3.2.0">6da295c0-37c6-4825-914d-fafa0bac2c0f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">85f2aa65-36d1-4221-822a-7a374d9e5422</cbc:ID>
+                        schemeVersionID="3.2.0">07278c0f-7eac-4f16-822e-a3d87acb9386</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >a9ab8a96-9384-44b4-b1f2-fa385e8fa2e2</cbc:ID>
+                >f6593e70-0583-4fe8-b67d-a6d855ee1874</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >976b5acb-c00f-46ca-8f83-5ce6abfdfe43</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5ce50493-f839-4565-8425-8bea84806e30</cbc:ID>
+                    schemeVersionID="3.2.0">b572353c-f6a8-4865-8e66-fd17c9da834b</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >64a2102c-4af1-4ecb-97b3-0c41907ec0f6</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">12a853a9-188c-4253-a921-c4d58278c8e3</cbc:ID>
+                        schemeVersionID="3.2.0">97c7657b-2d9f-424a-9631-b059405074cb</cbc:ID>
                     <cbc:Description>Have you taken measures to demonstrate your reliability
                         (Self-Cleaning)?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">eab7a0dc-d4b9-438e-920e-5ab188eb2350</cbc:ID>
+                            schemeVersionID="3.2.0">2372791c-a976-4e57-98a1-fe531b7ea9d4</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1946,29 +1952,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e21b5016-da3b-4967-ba9f-1f460c282755</cbc:ID>
+                    schemeVersionID="3.2.0">4592abaf-4e43-4c0c-914a-812e9645b7e4</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">27daab78-0fe8-4347-83c7-0a4a536326ea</cbc:ID>
+                        schemeVersionID="3.2.0">434eb37d-4f20-4b0a-b648-2898cc8e0c2c</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1993,83 +1999,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">207c4471-86c0-4969-aef1-c5c0824c75c5</cbc:ID>
+                        schemeVersionID="3.2.0">51be482f-92e5-4056-9f73-3050981f341a</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c525bfe1-7da6-49be-a474-8f4d584e2c23</cbc:ID>
+                        schemeVersionID="3.2.0">8317b384-69d7-4eca-8e58-a1064188dc49</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >cbe3e88a-9497-4bbc-b431-f0bef2dfa2a5</cbc:ID>
+                >47d9d620-74a5-4f58-be2c-9325b900a5eb</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >976b5acb-c00f-46ca-8f83-5ce6abfdfe43</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">91673111-4207-4d2f-9076-7b4cecce9405</cbc:ID>
+                    schemeVersionID="3.2.0">17f7216f-68c8-4969-95ae-20a62dc0c3cc</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >64a2102c-4af1-4ecb-97b3-0c41907ec0f6</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2d67c1c7-4b7a-4c0a-9baa-6419612d582d</cbc:ID>
+                        schemeVersionID="3.2.0">014d69ff-afb7-4f7a-9015-aac41c239131</cbc:ID>
                     <cbc:Description>Have you taken measures to demonstrate your reliability
                         (Self-Cleaning)?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">cf59ecce-b3f7-4936-a682-5b095e8ffaa4</cbc:ID>
+                            schemeVersionID="3.2.0">9581e08b-60f4-4301-9502-32f3359f7991</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2078,29 +2084,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">aebcd069-5bee-4758-9631-5208c75ed11e</cbc:ID>
+                    schemeVersionID="3.2.0">ae42d12a-6264-40d5-815b-7a32fe8c9592</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">46d807f2-faea-4832-b0ec-18beb0596488</cbc:ID>
+                        schemeVersionID="3.2.0">e0e5eedd-4d4e-43a7-b015-29786ad5c86e</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2125,78 +2131,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1c1321f2-3df7-452a-a982-2d742a1778a6</cbc:ID>
+                        schemeVersionID="3.2.0">a0649eca-b303-43a3-8e9a-d21c967da315</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bbe85b77-5857-48a0-aaea-1da87f6f9c98</cbc:ID>
+                        schemeVersionID="3.2.0">4b172b81-779d-4744-a1b9-ea763853b0dc</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >a708e210-b6db-4faf-ab59-9bd7b25eb189</cbc:ID>
+                >2c2781fd-057f-4bc7-b5b9-7e57a3ebcc40</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">8b181f89-587a-401f-92a1-5d869756c789</cbc:ID>
+                    schemeVersionID="3.2.0">49bf5bfb-d97e-47a8-b7e7-ea48d80c60e6</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f8da1674-e724-48b3-9085-176252b09a34</cbc:ID>
+                        schemeVersionID="3.2.0">cebaf690-9ddb-4ced-980a-3a8af61b2271</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cf4a1954-dea8-44a6-97fa-56288b8af94a</cbc:ID>
+                        schemeVersionID="3.2.0">ffa2562b-7beb-439b-8654-eaf1fbe4fe18</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2204,29 +2210,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">879d0806-294e-4d04-a9a3-9fb5e9ca0a28</cbc:ID>
+                    schemeVersionID="3.2.0">f4a7f80c-7294-4b19-9d49-02d786d66698</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1047dfca-53d8-4478-a59c-2c5ecb25163e</cbc:ID>
+                        schemeVersionID="3.2.0">ec2fe4ee-c568-4b6b-a11b-6291786cbc66</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2252,78 +2258,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4538bbcb-3f0c-4169-becb-59dcda76052d</cbc:ID>
+                        schemeVersionID="3.2.0">5fabffeb-69b5-4daa-9a5a-89b8a79f7911</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a8223eaf-6a4a-4a90-a60b-ac42c1029cac</cbc:ID>
+                        schemeVersionID="3.2.0">706a10f0-cf97-4e3a-9d55-2444c509c2d4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >7a7cf5fd-994e-460d-9c1b-60baa43661a3</cbc:ID>
+                >79da0447-a35c-4368-9383-916d1d67664b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">7e814790-fce7-487d-8873-e22753a7006b</cbc:ID>
+                    schemeVersionID="3.2.0">7b96f70a-a91c-474e-8e6b-92a8704b23c0</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">172fb659-f303-4c30-af16-8c6161eed9a7</cbc:ID>
+                        schemeVersionID="3.2.0">2c110fed-cbfe-45c0-8db1-7f71f92718db</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f26330ef-6819-41d2-bc8c-f404e09733c6</cbc:ID>
+                        schemeVersionID="3.2.0">38e40a0e-244b-41b8-b11c-148c3250b51e</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2331,29 +2337,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9b0e3ada-c533-4ea8-81fd-b3eb2ba141f6</cbc:ID>
+                    schemeVersionID="3.2.0">e6f307d9-8761-4f4c-827b-67d650a82144</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b62e1364-905a-4dbb-97d7-b985450d71e8</cbc:ID>
+                        schemeVersionID="3.2.0">e2e952f4-2b88-4b3f-8025-c67070f768ef</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2378,78 +2384,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8cdb5748-a5bf-438f-9100-74f918594ff5</cbc:ID>
+                        schemeVersionID="3.2.0">4c4468d7-40a3-47b6-b4a4-614b7d5397b5</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">926c0575-4fc5-43e6-9a87-c12cfd27a7de</cbc:ID>
+                        schemeVersionID="3.2.0">973d44da-d169-427f-9c02-e05bcbcc48e3</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >0d9acc76-3ee5-419f-b016-5f3d7c6ac5e6</cbc:ID>
+                >37faaaa5-63d4-40c5-b430-c1e5c072b1af</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">844fe180-e2f0-41d0-b30a-c9c32938e274</cbc:ID>
+                    schemeVersionID="3.2.0">26bf0f8b-46cf-46dc-9c78-1976fc48b8cc</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">37f8ba89-6e8b-48f9-94f9-7c459e871ef6</cbc:ID>
+                        schemeVersionID="3.2.0">45ff8ca9-e27a-4523-9f33-21f761287ac8</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">59aad4c0-0995-48ac-8d95-65c54eca2731</cbc:ID>
+                        schemeVersionID="3.2.0">6f185c28-b388-4b2e-bda7-220146eb23b4</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2457,29 +2463,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">6f7777c8-377a-42fc-90bd-3b9a254c54c5</cbc:ID>
+                    schemeVersionID="3.2.0">b2810718-902d-4263-a337-ef98965ee53f</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6db1be7c-83a4-4444-8fb9-d20d479e1b74</cbc:ID>
+                        schemeVersionID="3.2.0">f1bd3b74-e489-4171-a2d7-88e8a8fa721a</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2505,78 +2511,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a884bb08-04b1-4198-86bb-71e323c1edb7</cbc:ID>
+                        schemeVersionID="3.2.0">fd4de2f7-43ce-4d58-83ab-d45efe76233d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a1064e48-a55b-46cf-8368-39b8d2769c0b</cbc:ID>
+                        schemeVersionID="3.2.0">0bce580e-9661-4514-a8f4-77f93ae0b0bb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >96ca3ec6-1e3f-4ebc-915e-aff9fa48353d</cbc:ID>
+                >70aad752-164c-4169-b10d-6ed530e66175</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">559982a5-948a-4771-af44-ee191fbda4e3</cbc:ID>
+                    schemeVersionID="3.2.0">37109893-dab6-4fca-b95d-af219f6fd367</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">58e632c9-2c2c-4a33-ab94-5f46166118d4</cbc:ID>
+                        schemeVersionID="3.2.0">2b46b3b6-f222-48d0-bdce-ca0644dde39c</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">54843ad5-4998-47a8-b738-fc362146eec6</cbc:ID>
+                        schemeVersionID="3.2.0">8bee0d9a-1b80-4c50-9394-3c2ae112b898</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2584,29 +2590,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ecd17197-eac4-4cc7-8db5-cf7a3d463e22</cbc:ID>
+                    schemeVersionID="3.2.0">b8d4109f-4175-4555-9368-70de0d153acb</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">70d752de-8b8c-4cba-97e1-f049b7330c0f</cbc:ID>
+                        schemeVersionID="3.2.0">eeb1ecc5-17ef-4ee7-86b6-6a8e33b52339</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2632,78 +2638,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e377d613-ba25-4913-bd04-68f87f0492dd</cbc:ID>
+                        schemeVersionID="3.2.0">604013e0-c513-4583-b871-ffad14ec31a2</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">96b33c13-d4b8-46df-a311-4548fc461eaa</cbc:ID>
+                        schemeVersionID="3.2.0">2b1a82d3-364d-4946-9b7b-1314778d5def</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >f5cf4da4-a0df-4fcc-870e-7634345acb94</cbc:ID>
+                >f244f112-043d-41af-85e5-e7f34b437c2a</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">8b284860-2e0b-415f-a9d8-c5f0b6725eb6</cbc:ID>
+                    schemeVersionID="3.2.0">fa4e8ef1-c6b6-4e6c-bc3a-396ed63dee01</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5bce5d74-1b31-48f1-85a8-fa16aecf1429</cbc:ID>
+                        schemeVersionID="3.2.0">dd3871c4-a038-470a-b237-0ccaf77f58b9</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bce2ced6-7409-4121-8ceb-bd46555a5b66</cbc:ID>
+                        schemeVersionID="3.2.0">63d75deb-c691-40df-a6d7-d5b8bc7b7eeb</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2711,29 +2717,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a9ece190-fd33-42b0-a4c5-de19ee563d9f</cbc:ID>
+                    schemeVersionID="3.2.0">cc2eba3f-0069-4b34-a091-cf86ad0e05d8</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6b6ad38c-9fc3-4833-ba65-87b45fc4da92</cbc:ID>
+                        schemeVersionID="3.2.0">092092c1-40dd-49dc-8e71-bfe6fd0b53da</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2759,78 +2765,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9c958577-0f32-4927-9610-fb14ce009de3</cbc:ID>
+                        schemeVersionID="3.2.0">8c527b91-cb29-4a22-a26e-2a1e8f1354a3</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3ec1dc6e-d7fb-46ce-a149-8436449eeae4</cbc:ID>
+                        schemeVersionID="3.2.0">b086e27e-427b-4260-a749-00d6c8a02adb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >e93bbe10-1204-4b2e-b21c-4d12a854c2fd</cbc:ID>
+                >12e042e9-f6f5-4da6-9bc3-513497576a5b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">66c7f195-f187-426f-adce-c29220bdf76d</cbc:ID>
+                    schemeVersionID="3.2.0">567aeeb4-094d-4095-aa18-ad3b5d89be9b</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">31bb0390-6cba-4da0-9368-32e9d47ed03d</cbc:ID>
+                        schemeVersionID="3.2.0">1b263b7d-13e8-4eba-bb46-cb3e6b69262c</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e8d88fca-11a6-4271-9568-f3b76725ad5b</cbc:ID>
+                        schemeVersionID="3.2.0">b00b2997-ca27-43d9-a5af-b8ac48532c55</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2838,29 +2844,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">22d62158-47ab-44a9-9325-46880571993d</cbc:ID>
+                    schemeVersionID="3.2.0">4d0bf180-17a4-458a-90ff-1ffc934e2e65</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ff94e70e-740a-46ea-b163-348c5d26904e</cbc:ID>
+                        schemeVersionID="3.2.0">4a5ea8c7-2080-444d-a8a6-00213af58643</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2884,98 +2890,98 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2235cb4f-15a3-4112-b8ed-e4d0715fb5fd</cbc:ID>
+                        schemeVersionID="3.2.0">500a61e8-6bf1-4c42-a509-1dd6125df7ec</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1c272e38-854a-4b84-abd4-3ae416feec26</cbc:ID>
+                        schemeVersionID="3.2.0">00ed4453-da0d-4a0c-8d92-bc110c70fa0c</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >bf15899e-9b0e-4ee4-a6a2-1d3a26d7786b</cbc:ID>
+                >b8bea49f-ae1b-4d32-9270-04b34402dde5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e7fca006-0bde-4faf-bc9e-796c6fbdaf20</cbc:ID>
+                    schemeVersionID="3.2.0">0620ec2d-53cb-4135-9fc4-e3332557c063</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >2cbcf978-765c-40aa-996b-b1d082485cef</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">513d5594-b28e-4882-bdf0-9d862ac9e35d</cbc:ID>
+                        schemeVersionID="3.2.0">630105b7-45e3-407a-a87e-f1d101286649</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2eb3cbb8-adfd-4f19-a043-86de337207d1</cbc:ID>
+                            schemeVersionID="3.2.0">0f326061-311e-4095-bd0e-92814011be46</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your
                             reliability</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >ac51acd6-1bb9-4eb3-a9ec-8871d8dbdb20</cbc:ID>
+                                >7cd07197-597c-4697-a508-d9b625fe60c9</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2985,29 +2991,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a6011735-b153-4dfa-9d37-e0de8242d7b8</cbc:ID>
+                    schemeVersionID="3.2.0">1631b799-732c-4e70-aacf-bdd3ed2abaab</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">716e407c-9698-497e-b6e9-8ff89de6b8bc</cbc:ID>
+                        schemeVersionID="3.2.0">7c24b291-8133-45f8-bdf3-fc679dbb18ed</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3031,98 +3037,98 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">81460a90-4c89-49e5-93e2-2d12721ff7ed</cbc:ID>
+                        schemeVersionID="3.2.0">8725d22f-97fc-4e53-943a-0aec5b1cbd76</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a5a89b95-442f-4399-a660-641550e13258</cbc:ID>
+                        schemeVersionID="3.2.0">481671ae-846f-4108-ab8a-922d9a68bbd7</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >76a76978-0e09-4279-9eeb-67b7748ffbeb</cbc:ID>
+                >61ef43fd-9332-4bb6-8399-f86c30ffa916</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">32386bc6-72fc-4667-81b5-90d855796d9c</cbc:ID>
+                    schemeVersionID="3.2.0">6c35763d-49d8-4710-b846-410f12b773df</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >2cbcf978-765c-40aa-996b-b1d082485cef</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c2ba59c3-d63a-4af0-b653-c854a0b10a6e</cbc:ID>
+                        schemeVersionID="3.2.0">0d95113b-6f08-4e3b-bdd0-d691218e4ca5</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5ec7aa96-4a79-42e5-b1f3-439be8c41a43</cbc:ID>
+                            schemeVersionID="3.2.0">7d71d1bb-ca44-4360-ac2a-8bbb0b3129bd</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your
                             reliability</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >77df3350-e850-4821-8285-faad6e3a3c9e</cbc:ID>
+                                >f825b8d7-c40f-4248-98a7-32629876ae0a</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3132,29 +3138,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">dc0711bf-3455-4949-9b90-e1f5ed654834</cbc:ID>
+                    schemeVersionID="3.2.0">2d9e0673-b6bc-43f4-853d-ec5306379168</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b3d05d18-3d79-409d-a7e6-b9bd2fd7392e</cbc:ID>
+                        schemeVersionID="3.2.0">08b34243-c49d-48cb-a27b-bf780fe7002a</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3179,68 +3185,68 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">eda8c641-eb77-4d74-818f-0dc67cb1464b</cbc:ID>
+                        schemeVersionID="3.2.0">57cac9ef-2aa3-4536-9e88-44ae7c7d9bf5</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c292408e-e8a3-4009-9c78-7080d9c11be9</cbc:ID>
+                        schemeVersionID="3.2.0">3f341c91-dc09-4b12-bafe-462a4fc05831</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >aa429377-049c-4b51-9e3a-ee398e883d0c</cbc:ID>
+                >92255ef1-925d-4d9a-8d20-899971bf1498</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">226222fc-823e-4338-895e-c9558f872014</cbc:ID>
+                    schemeVersionID="3.2.0">6c6cc10c-5e99-46c4-840e-a20dd317e42f</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >73f0fe4c-4ed9-4343-8096-d898cf200146</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c7b4a480-7507-4750-91f0-1d32397570d1</cbc:ID>
+                        schemeVersionID="3.2.0">90e3a7e4-00e3-4a94-b712-adc1880c487b</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3248,29 +3254,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f2037f03-77d5-4801-ac23-deb70dbe7ce7</cbc:ID>
+                    schemeVersionID="3.2.0">e309eb1d-6568-4828-ba03-df0b23021cfd</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e6bee07-c345-48ea-bea1-0ec0e8c02089</cbc:ID>
+                        schemeVersionID="3.2.0">51a2a438-4298-4f8c-bb97-49be0acb619e</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3295,68 +3301,68 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">711802e5-7704-41af-95b9-a4fead677ad7</cbc:ID>
+                        schemeVersionID="3.2.0">1ab978df-786f-4088-adc0-618496aa69cb</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a477e350-4732-4c2c-acab-d82bf63bbbdb</cbc:ID>
+                        schemeVersionID="3.2.0">973a6ad3-625e-48b2-bfec-a4129a5dd37e</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >26be5eb4-36f1-4b50-9ca7-4f272da8c16b</cbc:ID>
+                >5181f6b2-9ce6-44af-bb08-a01ae0207018</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d8ce2601-6098-4b52-b494-f6285eb8b8db</cbc:ID>
+                    schemeVersionID="3.2.0">5b77cc3c-37f2-40bb-883e-7251d8ae877b</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >73f0fe4c-4ed9-4343-8096-d898cf200146</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6458cb22-7fbe-4f79-89ea-078d268b4a3c</cbc:ID>
+                        schemeVersionID="3.2.0">6a7a2a8a-e1c7-4289-a5ca-a960c3f00208</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3364,29 +3370,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e66cff5e-627e-4bcc-8a94-4d0da65e2039</cbc:ID>
+                    schemeVersionID="3.2.0">b19789e8-daa2-4608-ba33-dbbdf3f55d21</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8019ce07-fbab-4759-b177-6a7c67e37657</cbc:ID>
+                        schemeVersionID="3.2.0">63a47b02-8dc3-438d-89f8-7ee65b1e32fb</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3411,98 +3417,98 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5e3258db-ae73-44f9-878d-575f60e0defb</cbc:ID>
+                        schemeVersionID="3.2.0">26936cdf-0263-43de-b132-7ae8ef164c44</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b2a9ae09-abd6-4e71-aa97-89a31f26cbd2</cbc:ID>
+                        schemeVersionID="3.2.0">7c751ecf-bf6f-428e-9f9d-8152cbb27d5b</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >a525898b-b745-44a6-bd96-b0b3c6f98f86</cbc:ID>
+                >9aae8c57-fd08-4f0c-a7c3-5b86c128fc5a</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ce894cfb-7b4b-46d9-9425-28428b463b40</cbc:ID>
+                    schemeVersionID="3.2.0">ab0b5fa6-d35c-4a22-98a6-e75b45b8e76c</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >73f0fe4c-4ed9-4343-8096-d898cf200146</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3fa7779c-44db-4cb0-a035-228e3a1a625d</cbc:ID>
+                        schemeVersionID="3.2.0">7b2f615f-3dd9-4d7a-9b82-3092ff4be289</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1878a222-308f-4380-9987-6838c0112d1e</cbc:ID>
+                            schemeVersionID="3.2.0">1e980a14-892c-497e-bfd9-41785c652975</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6ce22550-93f2-4300-ba7c-973228ece3ee</cbc:ID>
+                                >9916ba80-7720-4b23-ab0c-ff40ab494cd2</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3512,29 +3518,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">755b6dd5-4b35-4be7-8cd7-8f072c21e517</cbc:ID>
+                    schemeVersionID="3.2.0">00c3553e-4edd-4582-9116-fe654e2848ba</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e03cb41f-ef59-4fba-a5d3-b3343a636f08</cbc:ID>
+                        schemeVersionID="3.2.0">62402b44-f5a3-43f1-8c39-dcd3cae09056</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3557,83 +3563,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dd0a6a1b-d470-4e42-ad96-0107c35f22f1</cbc:ID>
+                        schemeVersionID="3.2.0">d103f83d-7421-4ffe-9ffe-37b41c73c327</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">295e227e-cec1-49d7-aaf9-9dfb5269085c</cbc:ID>
+                        schemeVersionID="3.2.0">684c15cb-a5b9-41eb-9d2d-d4182c2a7c10</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >3a5ccb73-b62f-4ced-9c06-408ed1962097</cbc:ID>
+                >cd6d7e4f-33e8-4b7a-ad72-091729179a0f</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >f3a6836d-2de2-4cd1-81ca-fb06178d05c5</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">be53ca2e-7798-422d-a6d8-04c70c0bb1eb</cbc:ID>
+                    schemeVersionID="3.2.0">6e728048-d1f8-4dca-b243-12c699c19e4a</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ae083fad-502b-4ec8-8037-12a0f7b01b4e</cbc:ID>
+                    schemeVersionID="3.2.0">2946cade-432b-41f1-ad03-65deff06ae6f</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1f6f2ebd-dd78-4867-a2bc-1f404864bf11</cbc:ID>
+                        schemeVersionID="3.2.0">72372e7d-c0ba-45ed-a31d-6c45816431ff</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3653,61 +3659,61 @@
             documents?</cbc:Description>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >42cb1551-a6d5-4b4d-ae7b-1c5744ea2e8c</cbc:ID>
+                >34b5d234-54d9-407b-acee-9f12dacf05df</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >8d79d5f7-dc21-45e9-b188-e02008b854e0</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">833b08b5-10a1-4d66-8a76-863b445bd6fc</cbc:ID>
+                    schemeVersionID="3.2.0">d0d824a0-c53f-4b05-8e64-5af5934c49d8</cbc:ID>
                 <cbc:Description></cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4f5088db-ae29-46fb-b642-30240aa2248a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c74213bc-dcbf-40a5-83b0-caa4ec5276da</cbc:ID>
+                        schemeVersionID="3.2.0">ea75e124-3e89-41a3-9783-c54f30739632</cbc:ID>
                     <cbc:Description>[Text describing the national criterion]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a92418d5-af27-4aed-a64a-ae701ce08ec3</cbc:ID>
+                        schemeVersionID="3.2.0">3d45c069-a156-4094-85c1-7a1aac74c2d8</cbc:ID>
                     <cbc:Description>[Type of evidence from e-Certis]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2a098c0b-d314-4948-abfa-5e9c8816f747</cbc:ID>
+                        schemeVersionID="3.2.0">c7069018-ef93-471e-a4fc-a47adb6e2da9</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3715,29 +3721,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9b223e68-f217-4359-b8c8-cac26a873107</cbc:ID>
+                    schemeVersionID="3.2.0">aa3ec91e-0a51-4434-829c-0bfe07a726e5</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cd5c413d-aed3-43f8-b783-bdcb06ba0405</cbc:ID>
+                        schemeVersionID="3.2.0">1ae1027e-5eb0-4ae8-84bf-8acc6cf5e440</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3756,7 +3762,7 @@
             in that Annex.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -3766,113 +3772,114 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">347ecb6d-b156-4ef1-8c07-3fc038129a54</cbc:ID>
+                        schemeVersionID="3.2.0">32d774eb-4efc-41b4-abac-17a68f47b33f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">709cf4e6-efd4-4b04-b739-ba6e7a94770f</cbc:ID>
+                        schemeVersionID="3.2.0">593e6933-b2a4-4da0-9d91-595c8b623f8c</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >81db4338-2ab9-433e-89b7-05ff6fb1adb1</cbc:ID>
+                >835df845-ede5-4473-9982-c8468e79393c</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >b01d8f8f-ceac-4b47-b7aa-88cdeb630465</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ba208c20-cf04-4f05-a440-8454c4491f13</cbc:ID>
+                    schemeVersionID="3.2.0">a7aabe0d-11b3-4297-8a4c-748ddbda5bfe</cbc:ID>
                 <cbc:Description>occupation</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">CODE</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                <cbc:ExpectedCode listID="PleaseSelectTheCorrectOne" listAgencyID="OP"
-                    listVersionID="3.2.0">[occupation Code]</cbc:ExpectedCode>
+                <cbc:ExpectedCode
+                    listID="http://publications.europa.eu/resource/authority/occupation"
+                    listAgencyID="OP" listVersionID="3.2.0">[occupation Code]</cbc:ExpectedCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">810171fd-0a44-485e-bc8f-5c07d74695ff</cbc:ID>
+                        schemeVersionID="3.2.0">3e7f2d57-bf29-4835-aee3-5b74cf7967a5</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">820e1777-4e61-4538-ab34-35a59266c710</cbc:ID>
+                            schemeVersionID="3.2.0">a1a3ea8a-c269-4f44-86a7-380166c8bf96</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3a30bf14-7b13-4e19-8750-3fbe35737f92</cbc:ID>
+                                >ee6c8456-d130-482d-9948-b20c9a1d9542</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >194fdf78-5bed-43cb-873c-c59aae24421f</cbc:ID>
+                                >0d539cc2-dc9f-48f5-8f90-99da636afdbf</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -3882,75 +3889,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e4f18d1b-ad4c-4b3a-afd2-30da6b28a5b4</cbc:ID>
+                        schemeVersionID="3.2.0">4373af68-2745-441f-ba3d-9fce4a6b7829</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">76d94727-b7d6-4db3-8879-e2b22410213b</cbc:ID>
+                            schemeVersionID="3.2.0">ad421670-83ac-4d6e-869b-b9a1d86cf142</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4d6a3ed8-a487-421f-a16f-2219bc6339fe</cbc:ID>
+                            schemeVersionID="3.2.0">34069c58-a03e-4bf9-9f32-c874ebcd6fc3</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">9138d6ef-da4f-46d1-b601-1340f8598c39</cbc:ID>
+                            schemeVersionID="3.2.0">622a5d08-f828-4293-881f-395681406471</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >5e3148b8-c0f3-4e1a-b336-7b1e79dd9dc9</cbc:ID>
+                                >f060d45a-33f8-4628-b29c-9a9d423c97e6</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3971,7 +3978,7 @@
             Annex.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -3981,54 +3988,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">06bbb1a4-377a-4ce3-9d9d-bc188aa4e4ef</cbc:ID>
+                        schemeVersionID="3.2.0">c678c9bb-c7b8-4500-bfdf-addd142bae1f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b137e0e5-a67e-4e56-9545-74c03cc7247f</cbc:ID>
+                        schemeVersionID="3.2.0">aee86794-f57c-4c9d-baaf-64d487f83b19</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >f4e32450-7b05-4887-8f01-017fd8dbf277</cbc:ID>
+                >96751a49-64a5-451e-88c4-a19de79e3d2b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >a53561d5-6614-4dbe-987e-b96f35387f46</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2e52258e-5a8a-452b-b7d0-b599f7328848</cbc:ID>
+                    schemeVersionID="3.2.0">76b0722b-5d6d-42e1-8bfe-4d9819c58ab6</cbc:ID>
                 <cbc:Description>Register name</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4038,11 +4045,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">cbe4fa46-fa2e-418b-93b9-d321aadcb6ab</cbc:ID>
+                    schemeVersionID="3.2.0">2ad6f7dc-df36-410d-9263-31adf76b2160</cbc:ID>
                 <cbc:Description>URL</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4052,54 +4059,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5d0293ff-0e6a-429d-8b0b-8b6d20c30238</cbc:ID>
+                        schemeVersionID="3.2.0">52626f5e-ad9c-4bf9-aec0-3f6cc2232d53</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">52ff4ba4-0ef2-482e-8aa1-3d82787c695d</cbc:ID>
+                            schemeVersionID="3.2.0">60150dcd-d0bb-46e5-b95e-8ea0d82fa1ec</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >49623f7f-c51d-4aeb-94b6-422a728fdd94</cbc:ID>
+                                >83b0ff9b-a11f-43f8-8878-b61fdeee664c</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2d9dede5-0600-42f9-b7d4-75dcf795a176</cbc:ID>
+                                >5e1cd67d-796c-42ce-8e1e-5593c365ec46</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4109,75 +4116,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9a29e42c-aa1d-43e5-833c-09498d11dd5a</cbc:ID>
+                        schemeVersionID="3.2.0">3b327cb5-dc89-4e92-a777-c3b67d05b5a2</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">bae7768e-db5c-45cb-84c3-8143f26ce6ca</cbc:ID>
+                            schemeVersionID="3.2.0">bdce8929-d17b-4ce0-a2eb-c1a8e5edb354</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">59965fb8-5733-4ae3-b1d0-e1c84b89e4cc</cbc:ID>
+                            schemeVersionID="3.2.0">acd4dd06-97ef-4393-9225-9e31fedd6dc3</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">dcd1e5e4-224f-48e1-8a89-b78cd111255d</cbc:ID>
+                            schemeVersionID="3.2.0">8da01e2e-47b9-439c-89fc-c91c38e24e5e</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >a8345924-263a-4d98-9104-c687b93cf902</cbc:ID>
+                                >b841f8e1-de7e-468b-b2d6-b9f556f964e5</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4197,7 +4204,7 @@
             economic operator?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4207,49 +4214,49 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">82d45e41-9ed0-490a-b831-69cfa751e6fa</cbc:ID>
+                        schemeVersionID="3.2.0">54e1e3ee-f254-4da4-88cd-82361ffe16eb</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b21b0d91-7da0-41dc-956e-3292489e30bf</cbc:ID>
+                        schemeVersionID="3.2.0">be013655-66d5-4cb6-8459-5db0e7917a27</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7696fb3f-9722-43b8-9b91-ad59bb4b8ad2</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">370ba339-a877-467f-8ca7-0e406efbb465</cbc:ID>
+                            schemeVersionID="3.2.0">fa9c689f-5759-491a-aa62-295be0aa288f</cbc:ID>
                         <cbc:Description>If yes, please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">72b44482-fb8d-460e-97d1-dec72d883f9d</cbc:ID>
+                            schemeVersionID="3.2.0">9d11ceec-8154-4be2-91c1-7965c9ee5266</cbc:ID>
                         <cbc:Description>Indicate whether the economic operator has
                             it</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4257,29 +4264,29 @@
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >d87d4f91-b964-4454-bb27-19a573ad6b28</cbc:ID>
+                >3dc7f885-11b1-477b-91ab-9a08e690446c</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >a53561d5-6614-4dbe-987e-b96f35387f46</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">6095070b-85e4-4aef-b3e2-fbd1115cb536</cbc:ID>
+                    schemeVersionID="3.2.0">1dd1bb08-0839-4d2f-ac7b-de580b519ed6</cbc:ID>
                 <cbc:Description>Register name</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4289,11 +4296,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e00f9954-f600-4e7e-8aed-d968e915f788</cbc:ID>
+                    schemeVersionID="3.2.0">e148dbd9-7fa0-41f1-8052-811be3e3d373</cbc:ID>
                 <cbc:Description>URL</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4303,54 +4310,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">265464c3-55e6-4a4f-a6f0-cfc5429e283f</cbc:ID>
+                        schemeVersionID="3.2.0">6b7b7325-4629-4cc6-af99-fee331ecdbc4</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5b817966-c1e4-4723-ae4b-667303c102da</cbc:ID>
+                            schemeVersionID="3.2.0">eb361b46-9db7-445b-aa97-a8410b3aefe9</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e31cd4c5-7656-48b9-ad01-8f425b441f36</cbc:ID>
+                                >23d2e128-5091-4b51-9831-ccb3917c16df</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6e01ecfa-ccdf-4629-8296-a095609bc2e4</cbc:ID>
+                                >f6d8cf52-419d-4f81-9d6b-40fbba49f36d</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4360,75 +4367,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4ef049e7-6086-428d-b7f4-e6b6f55833c7</cbc:ID>
+                        schemeVersionID="3.2.0">9ac37fa4-4732-4527-9412-ee3fa2898ac7</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">fe1e6582-ce89-4473-9787-b9e002d9d31d</cbc:ID>
+                            schemeVersionID="3.2.0">4cfcfea4-5eb0-44cd-80c1-34aac9977c41</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1b6793d8-d93c-4f31-9edd-66d978cabb93</cbc:ID>
+                            schemeVersionID="3.2.0">5b8647db-528a-49cc-8f9b-bf286089a68f</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">19275ff4-a40b-4cd6-abb0-16c470028d3b</cbc:ID>
+                            schemeVersionID="3.2.0">95a644b2-387f-4b60-8a34-6943f97ef771</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >7a2ee1b3-bc49-4d69-9c03-15348dde9ff0</cbc:ID>
+                                >250e1126-6673-4605-85d4-bd4ddfe94595</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4448,7 +4455,7 @@
             economic operator?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4458,49 +4465,49 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4e6904db-c48d-467f-90ce-8f3647ace13b</cbc:ID>
+                        schemeVersionID="3.2.0">063b38c4-5e17-49a2-badb-d4525f725719</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1e1a9c38-e73d-4e37-9bac-145cc68d7289</cbc:ID>
+                        schemeVersionID="3.2.0">ca27d9d5-cd03-4b92-9c82-6bc0dc9b3f47</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7696fb3f-9722-43b8-9b91-ad59bb4b8ad2</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a0c92cb1-b62f-426c-94ef-6c1c3360d3f9</cbc:ID>
+                            schemeVersionID="3.2.0">e8153721-9d65-4912-a68b-d636131f11cd</cbc:ID>
                         <cbc:Description>If yes, please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">14d44e2d-f22c-4d6c-bd4a-4c5389498cd2</cbc:ID>
+                            schemeVersionID="3.2.0">1b5c1156-d53d-40a6-86ef-f1c2970ed997</cbc:ID>
                         <cbc:Description>Indicate whether the economic operator has
                             it</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4508,29 +4515,29 @@
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >2a7320e2-ac9d-4fa3-b1b5-6651a5bc6660</cbc:ID>
+                >71420e19-2289-400e-a58c-d3e0c82b878a</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >a53561d5-6614-4dbe-987e-b96f35387f46</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">59305111-c4f1-4c1b-bcbf-203f7a100450</cbc:ID>
+                    schemeVersionID="3.2.0">5077dc72-3e66-45d9-8be0-000688252567</cbc:ID>
                 <cbc:Description>Register name</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4540,11 +4547,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">afcdc1bb-6f3e-4e50-a9fc-6976de96959e</cbc:ID>
+                    schemeVersionID="3.2.0">ad14dc2d-d9b7-4e55-b527-b519ddd6e6d9</cbc:ID>
                 <cbc:Description>URL</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4554,54 +4561,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">561f80dd-a4ef-4850-8cb0-e55a293bd4a4</cbc:ID>
+                        schemeVersionID="3.2.0">d5af1db4-eb93-45f9-b245-56834c2c7aed</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7593b764-0a4d-47d6-89f0-0d7a6e075790</cbc:ID>
+                            schemeVersionID="3.2.0">7a2fb181-d83d-4ef4-b31f-2c07907713a2</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >cb79ad7a-8102-4174-8393-bdf484c7b620</cbc:ID>
+                                >756659ae-5f30-4926-9f9f-0107f6f72425</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e19c63d6-3bbf-4b96-a51b-837754edf902</cbc:ID>
+                                >9ded52ed-4515-4764-83b0-9dbc1e688755</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4611,75 +4618,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8af57bc1-3fc9-4201-be26-5dd2fbbf0962</cbc:ID>
+                        schemeVersionID="3.2.0">83d31491-25bf-40a4-85db-a53accb37155</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">9687850b-2238-4be2-b228-3e1514924617</cbc:ID>
+                            schemeVersionID="3.2.0">07882ee0-f357-4d97-ac22-ca0444735e2f</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4a257379-00a6-40a0-af74-4292813f50b0</cbc:ID>
+                            schemeVersionID="3.2.0">43ab3515-4ca3-4479-bac4-1e8506530be6</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7db168ce-1ae7-47c0-bc96-f94d3d55a6d5</cbc:ID>
+                            schemeVersionID="3.2.0">ffb387ff-894d-42ec-8528-f058ab42ae97</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c7932d58-463d-4435-a65c-f66f27f7201e</cbc:ID>
+                                >906343cf-01ad-4b5e-955c-ac64fba46325</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4699,7 +4706,7 @@
             follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4709,54 +4716,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">63d1fbb2-f70b-4d34-bfe1-eaab32da6a71</cbc:ID>
+                        schemeVersionID="3.2.0">d57fd5f2-d610-4f5d-996b-beb74e117578</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">337f3622-2caf-4df3-acd6-f721f74cd881</cbc:ID>
+                        schemeVersionID="3.2.0">6c041312-bc3b-4ee4-9210-8b5c2732dfef</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >1e504f9d-7012-4cef-a7ef-59d4f27805b7</cbc:ID>
+                >15ed44e5-7c34-4fb4-acf3-54fe3d252f5b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >5f22470b-df27-4ffd-ba4e-0973a41f97ca</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2bd8eca3-ee44-4ed0-8d44-c728847b0407</cbc:ID>
+                    schemeVersionID="3.2.0">e950261b-64aa-4081-8478-0803f6239251</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4766,26 +4773,26 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">3c051949-0eff-4794-98fd-813565cdceec</cbc:ID>
+                    schemeVersionID="3.2.0">e6160cc1-75c7-4d9b-9d0e-f72fec07784d</cbc:ID>
                 <cbc:Description>Threshold per year</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">CODE_BOOLEAN</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                <cbc:ExpectedCode listID="BooleanGUIControlType" listAgencyID="OP"
+                <cbc:ExpectedCode listID="boolean-gui-control-type" listAgencyID="OP"
                     listVersionID="3.2.0">CHECK_BOX_TRUE</cbc:ExpectedCode>
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4a00575d-c8f0-4854-89cf-da4025c3b1d8</cbc:ID>
+                    schemeVersionID="3.2.0">08b805c6-e140-4e27-80b8-82e560afaa72</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4796,54 +4803,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">39d550e1-bfbc-4d8a-b789-43097f9d7658</cbc:ID>
+                        schemeVersionID="3.2.0">e0b350c8-440e-42bb-9921-53111dab2151</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2458b132-dcd1-4170-bd15-f70ef750ca90</cbc:ID>
+                            schemeVersionID="3.2.0">aabe983d-4186-448e-b196-aaca7fa5f7b7</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >db6e3f78-7fea-4393-a962-3f757405e47e</cbc:ID>
+                                >d64de756-cfb2-448e-8667-84e917c07604</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >da0bece8-41f1-4be5-92a3-8bed7adc5235</cbc:ID>
+                                >89a9b55c-497e-4afd-9c65-3ebc1d482ab3</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4853,53 +4860,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >c0cd9c1c-e90a-4ff9-bce3-ac0fe31abf16</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">20f7cd0e-35d9-498b-9364-d8fbf97f55ff</cbc:ID>
+                        schemeVersionID="3.2.0">d33b96d4-9c44-4300-af5c-5bc13ea91053</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5302a421-1658-48f4-8f59-e9a8fcfb85c9</cbc:ID>
+                        schemeVersionID="3.2.0">874096f6-700d-4948-a131-047315dc0da9</cbc:ID>
                     <cbc:Description>Start date; End date</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">eb310ae4-a45f-40c1-9f44-82fb5f786032</cbc:ID>
+                        schemeVersionID="3.2.0">0bdd7380-02d9-488e-b605-f267869f877c</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">879b110b-117a-462a-b707-6649877f5e34</cbc:ID>
+                            schemeVersionID="3.2.0">f7c040ca-7b62-491e-b119-9f78ace8b2fe</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4907,47 +4914,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3f4505e0-0a5a-41f0-b08d-ca313543318d</cbc:ID>
+                        schemeVersionID="3.2.0">2eab1d2d-e309-4b36-a678-6cdb0ff6fca0</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5de07e96-509a-4d8c-ae46-82aca5a86237</cbc:ID>
+                        schemeVersionID="3.2.0">7c48e550-10c7-4d25-a1b6-f8b3116b33a9</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6f7f84fb-90e0-4210-93a0-04ff2264772b</cbc:ID>
+                            schemeVersionID="3.2.0">499e8b81-5a24-4883-a8d0-751fc10b99a2</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4965,7 +4972,7 @@
             relevant notice, the procurement documents or the ESPD is as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4975,54 +4982,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1fae5b9d-3f13-4a47-8d8f-c63492a0cd20</cbc:ID>
+                        schemeVersionID="3.2.0">d5d1f1e9-fd40-4678-9c2a-1c17ec809f74</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dbd29d1c-c928-43a5-81e4-20967bc06be1</cbc:ID>
+                        schemeVersionID="3.2.0">df9cbd77-b4a5-4185-8bc8-5ee29cea2837</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >61df4782-e014-4433-b999-dccf8313acaf</cbc:ID>
+                >c305b658-c17a-4018-92c5-a7a42874f968</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >53882893-f4a8-40ae-99dc-cad7b0748790</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">51c86472-68a6-456c-a953-c6aabbf68252</cbc:ID>
+                    schemeVersionID="3.2.0">39e9c1d4-9d13-449a-bfb4-97de36d3aa24</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5032,11 +5039,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9046b076-5fda-460a-b99a-c143a8d2b921</cbc:ID>
+                    schemeVersionID="3.2.0">8b222efe-634e-4c7c-84a2-5b49133a79b8</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5047,54 +5054,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5e163a29-aa47-44be-ac50-8654d7833169</cbc:ID>
+                        schemeVersionID="3.2.0">8d2b1fb3-f36a-4e7a-81e3-ceb2c86a4c83</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">76b30fb8-ca35-4a98-b711-97245f18fbe2</cbc:ID>
+                            schemeVersionID="3.2.0">1b340387-49cc-4f16-9d4b-fe6f7dd9465d</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >eb2ab949-2e22-4200-827c-819019210ea8</cbc:ID>
+                                >4f161124-34ad-43a6-818f-57f3fde06c22</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b29505ed-a5ea-49b2-b58b-a2cec2ab19bf</cbc:ID>
+                                >c82b332c-0ac7-47cd-b172-f6f6289bd836</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5104,53 +5111,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e1886054-ada4-473c-9afc-2fde82c24cf4</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4e7b085b-cc90-42a9-98f1-81b3cfbb7c0a</cbc:ID>
+                        schemeVersionID="3.2.0">e5f18123-b47f-459a-990d-529dbc2ca1e0</cbc:ID>
                     <cbc:Description>Average for the required period</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f2a2c9d5-2c35-4a6b-bdce-d7271ce1530d</cbc:ID>
+                        schemeVersionID="3.2.0">dea6b9d7-1fb2-47a6-97d9-4d92e21bb7d7</cbc:ID>
                     <cbc:Description>Additional information</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5ec1ba2e-a1d0-4476-af86-b4ff61587965</cbc:ID>
+                        schemeVersionID="3.2.0">f662e946-2b66-4bcd-a7ec-18d0be20c310</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">72652dba-b9cb-4075-bd61-d3382a53ac32</cbc:ID>
+                            schemeVersionID="3.2.0">35ba5fd3-352b-4571-874f-06320b44b051</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5158,47 +5165,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ded204ac-fb38-4675-9427-30166486e19f</cbc:ID>
+                        schemeVersionID="3.2.0">bb364819-bfe5-496c-8b35-4d7d80c8a14f</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2cf4f72c-0e84-4dda-b9c8-feb1b87213bd</cbc:ID>
+                        schemeVersionID="3.2.0">41749c91-7144-4495-a106-b4f01c412186</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6a50e20e-4112-4d7d-80c8-02ced1925acf</cbc:ID>
+                            schemeVersionID="3.2.0">9d1f2516-0ad5-4aca-b455-2a664e6dd9b0</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5217,7 +5224,7 @@
             relevant notice or the ESPD is as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -5227,54 +5234,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a697824d-e27c-44b9-a428-f53f35adf41d</cbc:ID>
+                        schemeVersionID="3.2.0">133ae8c3-6faa-436e-a27c-14ded8724f6b</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">42dd929f-8f35-4826-92a9-d39d2e6125b6</cbc:ID>
+                        schemeVersionID="3.2.0">79a1006a-c0e2-4563-b604-039fa60b5fbb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >00f6b8ef-9e72-457d-a072-74fc8e4f8ce7</cbc:ID>
+                >7d521e36-0528-4d50-b0ff-bb3cd6294052</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >6cff132b-8d15-4f79-ae37-2f9295432381</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">57a800f0-c61d-415e-b84b-496cb11599e2</cbc:ID>
+                    schemeVersionID="3.2.0">1f880cf1-89ff-4cea-9192-d6c1af78b828</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5284,11 +5291,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">543cf35e-1b20-4256-88b2-5c5699c2bfc2</cbc:ID>
+                    schemeVersionID="3.2.0">b3430715-8a9f-4b90-89ba-cae6c995d554</cbc:ID>
                 <cbc:Description>Business domain description</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5299,11 +5306,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">272d0f24-8b40-4037-9f04-2e032ae304f0</cbc:ID>
+                    schemeVersionID="3.2.0">5689fc24-deef-4ee4-9e1e-a99a661751b4</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5314,54 +5321,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">122189e8-1165-4313-b7da-b043f820855b</cbc:ID>
+                        schemeVersionID="3.2.0">dd2d1114-5f81-42ab-b083-03deb8b6b186</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a669c2e0-2143-4535-9780-fd196d600c9a</cbc:ID>
+                            schemeVersionID="3.2.0">1b769c55-5045-490b-9296-3b9a6a12d7f1</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0de347a0-80f2-4cab-af7b-4c237f2a97e4</cbc:ID>
+                                >9528fa90-6b50-4e25-8857-5be1cc548d39</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f6a23d5f-5616-404a-afa6-2d628495a98f</cbc:ID>
+                                >a1ab6f7f-41f2-4ebd-bb07-c3ed61630c1d</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5371,53 +5378,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >c0cd9c1c-e90a-4ff9-bce3-ac0fe31abf16</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">02b20f0f-f3f7-4e01-ba0b-6d3b46f52255</cbc:ID>
+                        schemeVersionID="3.2.0">453ceff4-3f1d-4671-8def-a21d4eaf8723</cbc:ID>
                     <cbc:Description>Start date; End date</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dc058513-cfdd-4091-b244-7dfba6984677</cbc:ID>
+                        schemeVersionID="3.2.0">e2b8836f-c58c-4f60-ab7c-8aa0225bffee</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2851fc73-309e-4311-a4f2-bd9982548a86</cbc:ID>
+                        schemeVersionID="3.2.0">d2d399b3-4299-4fde-8443-b2f5d88e6393</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ff735492-e19a-4e7a-8f6d-7605de306207</cbc:ID>
+                            schemeVersionID="3.2.0">96d90e43-77b4-408d-bdb5-387c73ee7772</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5425,47 +5432,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ea84008c-d433-4f35-b890-cf759a867d7f</cbc:ID>
+                        schemeVersionID="3.2.0">5b202fdb-a84a-4890-b706-82b391e15e67</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d89aa35f-1075-4dcd-a9de-9a8bfe6b28aa</cbc:ID>
+                        schemeVersionID="3.2.0">9a7b15b9-b453-44b2-827c-5068def55854</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e7114963-6494-4a1b-abbc-abd6ea610905</cbc:ID>
+                            schemeVersionID="3.2.0">f109b4ea-9afe-4709-829e-b27ec92550bb</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5484,7 +5491,7 @@
             relevant notice or or the ESPD is as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -5494,54 +5501,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">25392dba-fc3b-4b7c-b1fc-f8562766a819</cbc:ID>
+                        schemeVersionID="3.2.0">bbb9ac08-2bc9-4b07-b454-6d4ca8001ff7</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1803ee38-79c8-4bcf-9175-57e36d2b3597</cbc:ID>
+                        schemeVersionID="3.2.0">c3577644-741f-4de0-bd03-2990bf054633</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >2fef4038-928a-4231-8940-5acf5128266a</cbc:ID>
+                >fa4a543e-5439-4dae-b552-aa83173dcc93</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >19a68e37-d307-4a28-9061-c22cd767be58</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c615c25b-7867-4661-ad89-6fc22aa7c986</cbc:ID>
+                    schemeVersionID="3.2.0">9bf71170-d6a2-4529-96d8-f28747aeb6ef</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5551,11 +5558,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">41d58b3d-e5b0-4ad1-a8f9-d41c5c490ad7</cbc:ID>
+                    schemeVersionID="3.2.0">4c778e57-aced-4d8c-ac37-d7b44de2531a</cbc:ID>
                 <cbc:Description>Business domain description</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5566,11 +5573,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4a58c712-4d55-4da1-b1a2-399ae369f74f</cbc:ID>
+                    schemeVersionID="3.2.0">f69e81fe-8d6d-4164-ac1b-cd9c4b803275</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5581,54 +5588,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9d90ed39-d7da-4dec-b3e7-d3cbc80cc5e5</cbc:ID>
+                        schemeVersionID="3.2.0">0e340daa-c45d-4815-b739-eceb47354366</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2fa30107-4aab-4cfa-8ab2-be58f7a79e0b</cbc:ID>
+                            schemeVersionID="3.2.0">29fd6f80-0bac-46e7-8bed-0beddd8b0c50</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >22d24a10-f340-4e65-9a83-524dd3f2f88c</cbc:ID>
+                                >335ca321-4558-45c8-8056-31455d311e9f</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8802fac7-29ee-485c-873b-d33d45ad1b5e</cbc:ID>
+                                >152997e4-4816-4f13-95f0-1dbc376fcd31</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5638,53 +5645,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >c0cd9c1c-e90a-4ff9-bce3-ac0fe31abf16</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3886d2a7-8706-4efb-8d79-a1b4c6ca6898</cbc:ID>
+                        schemeVersionID="3.2.0">21d5cffb-f82e-4dcd-9528-fdae4e4bea2d</cbc:ID>
                     <cbc:Description>Start date; End date</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2eabef1e-34b9-4f90-8cc4-dff1f14c8c24</cbc:ID>
+                        schemeVersionID="3.2.0">807796cc-814a-469c-8a87-0b2a59c5824e</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4192dc66-bda9-4826-963a-9157584646c4</cbc:ID>
+                        schemeVersionID="3.2.0">22c79199-4af9-4d00-8c80-61043e783e68</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">9bcb6d75-2a8d-4ca9-a999-77bb67358407</cbc:ID>
+                            schemeVersionID="3.2.0">3a4a1881-64a0-460f-af16-7dcea892ba0d</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5692,47 +5699,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a131e596-12bf-4402-97c7-020bf5352365</cbc:ID>
+                        schemeVersionID="3.2.0">1b5889c0-0cee-4c8e-bd74-410356f5eda7</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e649bdb7-b204-4099-9fe3-098486838b17</cbc:ID>
+                        schemeVersionID="3.2.0">e2e9d35c-ffb5-4410-8dcd-17ded0bc5458</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">be1db1b4-aa90-44d3-be6d-1030ddac67c3</cbc:ID>
+                            schemeVersionID="3.2.0">7a9e8f1f-a345-4b3a-8a44-4e5d8ea2de29</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5751,33 +5758,33 @@
             for the required ratios are as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >c9f3ecb0-ec5a-4483-8d36-c11d7acc2655</cbc:ID>
+                >a3ae8a6f-56c9-4a3d-9b5e-017dca0f240b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >cc1da737-6c4e-4f4e-821d-c260029058f6</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0f821205-5e4a-454b-afbb-fc119e664ace</cbc:ID>
+                    schemeVersionID="3.2.0">fe79aebd-ae34-46da-8e88-9f0555d8e39d</cbc:ID>
                 <cbc:Description>Select the periods applicable for all ratios</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5791,30 +5798,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >ee486082-93fa-4c17-8920-fdf01b890bd1</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f344f30d-fbc9-4631-9561-c18216394951</cbc:ID>
+                        schemeVersionID="3.2.0">e82e4ffb-871f-4d23-93e6-651c341e20d5</cbc:ID>
                     <cbc:Description>Ratio Type</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">CODE</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                    <cbc:ExpectedCode listID="PleaseSelectTheCorrectOne" listAgencyID="OP"
+                    <cbc:ExpectedCode listID="financial-ratio-type" listAgencyID="OP"
                         listVersionID="3.2.0">Assets to equity ratio</cbc:ExpectedCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e6fa52cc-603d-4434-b555-2e46e2a007e6</cbc:ID>
+                        schemeVersionID="3.2.0">57ef0ced-34ab-4173-873f-1d59b76c7977</cbc:ID>
                     <cbc:Description>Definition</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5825,11 +5832,11 @@
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4de2f1b0-283b-4c1f-87f6-7f1695aecf52</cbc:ID>
+                        schemeVersionID="3.2.0">1c62943b-faad-4ca6-9784-7bf6850f8f6b</cbc:ID>
                     <cbc:Description>Minimum requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5841,54 +5848,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c5047212-841f-4e4a-a466-a540dead2e7c</cbc:ID>
+                        schemeVersionID="3.2.0">2c86c84f-1709-4bec-96e1-5310a064a576</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d52ec3a8-838e-4b42-bb77-8f1d0a67efd6</cbc:ID>
+                            schemeVersionID="3.2.0">0f6b5e01-b7f3-4a63-8980-e1f2585bff46</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f8b1062d-9f5f-4239-956a-e36905ba721b</cbc:ID>
+                                >989c1108-9f1f-4b4b-a08e-ab7690f9c1ea</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >a4883134-9e4d-4038-b645-f97b1055c65f</cbc:ID>
+                                >a969f7b2-2d2e-481c-977b-bda985d5c9df</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5898,44 +5905,44 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >78b2e0e6-1bfe-43f5-a061-d9cf4e6e6ecc</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">97e3db4f-b81d-4527-bf2d-a46d70476394</cbc:ID>
+                        schemeVersionID="3.2.0">4169a4e5-7f6d-4c04-a01f-a73d72ae3500</cbc:ID>
                     <cbc:Description>Please provide your ratio</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">936f8df2-3ade-4ab9-8b2f-7c261160e6ac</cbc:ID>
+                        schemeVersionID="3.2.0">4a6ed36c-e713-445d-892c-537af0ad5356</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">893acf99-408c-4a9f-8279-fa00ec9653f7</cbc:ID>
+                            schemeVersionID="3.2.0">84290aef-4656-47b6-aa31-82c98d2d9c92</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5953,7 +5960,7 @@
             following:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -5963,54 +5970,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0171f745-297f-4ed2-89f7-3737d21f3345</cbc:ID>
+                        schemeVersionID="3.2.0">5baf2ddb-478b-45bc-aaee-f6f9919fd2d1</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3fa9e2ab-5bc0-46e7-bcb6-327cebe19f3b</cbc:ID>
+                        schemeVersionID="3.2.0">55a3ba8f-982b-4dbf-ab0f-b26363ca9513</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >6997af47-3df9-48e8-a851-948caff77541</cbc:ID>
+                >76100cc7-c54d-4c83-a48e-ec3f369e463b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >83e3dcc4-c9b3-47e5-9fb8-ffd8386679f1</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9c400582-cd49-4f40-b3b4-b2bcfb4e8759</cbc:ID>
+                    schemeVersionID="3.2.0">61547077-2ec4-4010-bd2d-55b91dcc55a4</cbc:ID>
                 <cbc:Description>Type of insurance</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6021,11 +6028,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0bd977fb-7d1e-4020-9f9f-4052950f8657</cbc:ID>
+                    schemeVersionID="3.2.0">0ef48545-0b53-4d76-91ba-b6751cd36d9e</cbc:ID>
                 <cbc:Description>Minimum amount</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6036,54 +6043,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">33af225e-b12e-452c-8472-299eeae90716</cbc:ID>
+                        schemeVersionID="3.2.0">f23d9100-bbd4-4bbe-9675-152fd977ccce</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">342cfbb8-884c-412c-913b-d380fc0aa3ba</cbc:ID>
+                            schemeVersionID="3.2.0">78ce66bd-56e3-43e4-8235-4fd221ee602a</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >d6e5284c-0cc3-4238-a1e4-cbedcf9c2e9e</cbc:ID>
+                                >c503d5de-1e66-48c2-ab5c-debdad39ef1a</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1f68e150-d72a-49c2-84ff-c950708cc969</cbc:ID>
+                                >03b3a0dd-464e-4b30-9a40-7c362bb0bc08</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -6093,63 +6100,63 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >42dc8062-974d-4201-91ba-7f2ea90338fd</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7051e005-cdd2-4de7-902d-aa194175c74b</cbc:ID>
+                        schemeVersionID="3.2.0">d9182c85-2e4b-4e43-9d7e-87d173dcf40c</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">375ea8df-3091-4b1e-9c90-737166384d97</cbc:ID>
+                        schemeVersionID="3.2.0">e9a89e55-64d2-4745-88aa-fa7a8006f824</cbc:ID>
                     <cbc:Description>As an EO I will commit to obtain the minimum amount
                         required</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a4e38751-cfe5-46b9-8799-2eaf378829ae</cbc:ID>
+                        schemeVersionID="3.2.0">c95c6e4d-f83e-44fb-91e9-28338d076b51</cbc:ID>
                     <cbc:Description>I am exempt</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">11569e7c-c0e9-4b6e-b07c-87cb00f5bbf4</cbc:ID>
+                        schemeVersionID="3.2.0">ea5ff060-1d01-4c11-8855-c88ebbd8d33b</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2fb98ee7-76b6-4052-8cb1-684d01915e29</cbc:ID>
+                            schemeVersionID="3.2.0">e0082599-d105-4d82-abea-cd335eb248c8</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6168,7 +6175,7 @@
             declares that:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6178,89 +6185,89 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">85c6792d-c936-480b-b6f4-89bc5573e03a</cbc:ID>
+                        schemeVersionID="3.2.0">378793ab-23a5-4715-870f-79fc465af05c</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6afab6a1-4d60-4f48-b181-fc6fd2b58eac</cbc:ID>
+                        schemeVersionID="3.2.0">226e3fbd-38f6-4a7e-976f-98e094b118c4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >099b4a86-80d1-49f2-85ac-05f3d777f660</cbc:ID>
+                >c4a43e79-1205-46de-950c-164baeb47306</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >4ddccd16-91e4-4b72-ae0f-78f2f1ab9490</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">8d7715fe-775b-4c60-8652-8149b423a6cf</cbc:ID>
+                    schemeVersionID="3.2.0">e2fdda11-38c4-48e1-aef1-9a8fce61f4e8</cbc:ID>
                 <cbc:Description></cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >26ece6a2-b360-46c1-890d-8338913b8719</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2bff808e-1e68-4b6d-9904-1b7f7ba85ad9</cbc:ID>
+                        schemeVersionID="3.2.0">2f3e0cfb-2de1-4382-93b1-be7b87e290de</cbc:ID>
                     <cbc:Description>Select the type of requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">CODE_BOOLEAN</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                    <cbc:ExpectedCode listID="BooleanGUIControlType" listAgencyID="OP"
+                    <cbc:ExpectedCode listID="boolean-gui-control-type" listAgencyID="OP"
                         listVersionID="3.2.0">RADIO_BUTTON_TRUE</cbc:ExpectedCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >ca15c15f-110e-4a10-8d6e-5e41cf5f9098</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">3be70221-a5bf-4dd4-858e-b4df7bf46dd7</cbc:ID>
+                            schemeVersionID="3.2.0">56ad4d38-92be-4634-b870-73a52b08d85b</cbc:ID>
                         <cbc:Description>Description of the economic or financial
                             requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6270,11 +6277,11 @@
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">3fba35a8-c6ac-4d38-b856-dbc133c75ee8</cbc:ID>
+                            schemeVersionID="3.2.0">0059a0d4-2e0c-46ba-9d89-73ddadd6456a</cbc:ID>
                         <cbc:Description>Minimum amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6284,11 +6291,11 @@
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ca31c9ee-ef6f-4a66-898c-cbb2675cf438</cbc:ID>
+                            schemeVersionID="3.2.0">ad8214c5-d313-42c2-8eba-7136eb44a0a1</cbc:ID>
                         <cbc:Description>Start date; End date</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6302,16 +6309,16 @@
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >9b3a04ff-e36d-4d4f-b47c-82ad402b9b02</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >39a46f41-f594-443a-801a-3d0b8666ee92</cbc:ID>
+                                >0df24460-da87-4cde-8c64-7fb8433582ad</cbc:ID>
                             <cbc:Description>Amount</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6319,15 +6326,15 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >cc96aa19-a0be-4409-af58-ff3f3812741b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">76d78dcc-f77b-499b-9731-26874cdc95c5</cbc:ID>
+                            schemeVersionID="3.2.0">7fc12631-bbd5-4e64-a832-27615a88e844</cbc:ID>
                         <cbc:Description>Minimum rating</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6337,11 +6344,11 @@
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">49b6aaa4-fc38-4ba4-b919-715ca5ac096a</cbc:ID>
+                            schemeVersionID="3.2.0">3110150f-8b48-4a4d-bb55-f514e815a1f8</cbc:ID>
                         <cbc:Description>Rating scheme</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6352,16 +6359,16 @@
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >5fe93344-ed91-4f97-bcab-b6720a131798</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0f7b141e-868d-41a6-9847-a49877625465</cbc:ID>
+                                >ccfb636d-cd62-4238-99ed-704e6ca04ebd</cbc:ID>
                             <cbc:Description>Rating</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6369,31 +6376,31 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">33908c67-80af-441f-81cd-f9ae4f88c34f</cbc:ID>
+                            schemeVersionID="3.2.0">62edbc1c-93b9-4f6d-b56e-5c1c7e45a4db</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b66950d2-6a62-41fa-8622-b0dfa48b3096</cbc:ID>
+                                >bcabacdb-5246-4789-9eb7-0d623862bf93</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6414,7 +6421,7 @@
             years.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6424,54 +6431,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6aa1b11b-a775-4871-aa73-05bf91a0653c</cbc:ID>
+                        schemeVersionID="3.2.0">0deb22ab-9bad-43ee-9c46-1e39298862f9</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2f16cc88-5c6b-4079-8550-553b9d9740a9</cbc:ID>
+                        schemeVersionID="3.2.0">2d4efee2-4f2c-4747-9ed0-b2a4c7f2286c</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >aeded8e3-f8ba-4779-b4d3-395ad6663574</cbc:ID>
+                >e929689e-7178-427c-8448-1207e574bc50</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >381bea15-9460-49f7-a6d0-15d13059de29</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">818015e0-2527-4668-9590-65d7e088d927</cbc:ID>
+                    schemeVersionID="3.2.0">989702df-f96c-4c5c-ae47-7cff220ba0a5</cbc:ID>
                 <cbc:Description>Minimum number of references</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6482,29 +6489,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e7447159-79d5-49c1-8c92-d033daad46f8</cbc:ID>
+                        schemeVersionID="3.2.0">e997e07b-e6bc-40e2-b26a-93f137938428</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >d663aca5-5f3c-4980-b825-81e1bd7db381</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4a7bff56-a94e-4d66-9874-2b645a45d461</cbc:ID>
+                            schemeVersionID="3.2.0">83beef4a-efd7-4552-a75e-a82c14d9731b</cbc:ID>
                         <cbc:Description>Requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6518,150 +6525,151 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a44e24e9-f878-4651-9ead-e0b1387dae09</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7172b884-d6ff-4e4f-9fb8-b6d5fc1bcfdc</cbc:ID>
+                        schemeVersionID="3.2.0">75c9a2c6-600d-45c3-a88f-0cc46c3904f3</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >c8ec5c30-2c17-4936-abbb-392523d873e5</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">fc1398d0-8576-4b49-b680-6562b2acf947</cbc:ID>
+                            schemeVersionID="3.2.0">4abe33b2-0c46-4878-b9dd-05b6b5e627e6</cbc:ID>
                         <cbc:Description>Reference description</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">b6815579-49e8-4007-8b94-43cc4f471ca4</cbc:ID>
+                            schemeVersionID="3.2.0">ba0699bc-5640-4bc9-8cc9-2ab670338b56</cbc:ID>
                         <cbc:Description>Total amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">bf9b23ac-132f-4791-b3f6-78fdbab2980e</cbc:ID>
+                            schemeVersionID="3.2.0">6e59aba0-63f5-43ae-a36e-0285d1e44563</cbc:ID>
                         <cbc:Description>Activity of the economic operator</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">bb285219-a1a3-45ab-91e4-c2ec88165465</cbc:ID>
+                            schemeVersionID="3.2.0">fc80cd6c-9d2d-4200-8bd2-0c4e436a024d</cbc:ID>
                         <cbc:Description>Specific amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e8f09071-e560-4840-9a4a-74bf27a0641e</cbc:ID>
+                            schemeVersionID="3.2.0">a61ffe2d-326a-4ff6-8edc-9ad11ab88974</cbc:ID>
                         <cbc:Description>Period (Start and End dates)</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d8e826ae-b39f-43ac-bcf1-f727861ac335</cbc:ID>
+                            schemeVersionID="3.2.0">a3689265-e265-44ef-a421-da804a7f06d5</cbc:ID>
                         <cbc:Description>Confidential</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >6afa7569-e4c4-4538-be89-84a82b2a301b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0f86d18e-c337-4c4f-8046-3ddd6feb6021</cbc:ID>
+                                >c4fc9a64-02af-4277-a31a-4ee040a108ba</cbc:ID>
                             <cbc:Description>Recipient name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2b844126-6290-4668-a10a-03787a6db6f8</cbc:ID>
+                                >a91f90e9-8605-459d-abcb-2c832e9e7dfd</cbc:ID>
                             <cbc:Description>Contact person name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >7e0e3b8c-4ef4-464f-af37-19132dbbd12b</cbc:ID>
+                                >721db70e-99df-4512-ad68-36d826ee7539</cbc:ID>
                             <cbc:Description>Contact email</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1ba266af-ff69-49df-bf9b-de483d50f2f4</cbc:ID>
+                                >45992824-bc8d-4efc-b53d-72bddc5f4d57</cbc:ID>
                             <cbc:Description>Contact telephone</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8536f119-0040-4684-a720-c2c761354d49</cbc:ID>
+                                >6836b4a3-f572-41ee-9030-ace0a78be635</cbc:ID>
                             <cbc:Description>Is this information available online?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >c1c2748a-2fa1-45aa-b5bb-b2f6dcdfa7ab</cbc:ID>
+                                    >bbc6aa84-6aee-4ce1-bc75-bac76aa5b49a</cbc:ID>
                                 <cbc:Description>Evidence Supplied</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -6684,7 +6692,7 @@
             more than three years.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6694,54 +6702,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6142bfca-39fd-48ea-a876-da5120610805</cbc:ID>
+                        schemeVersionID="3.2.0">50b9e5ed-8b7b-4ea3-9160-d26dd50062fb</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">496067d6-f1d1-41ae-9d89-6b3b9a00f55d</cbc:ID>
+                        schemeVersionID="3.2.0">8adb05bd-eac1-414e-b40f-d2a6c58528f4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >508f4ef6-c36e-4411-aa0c-0d5d1d7aef44</cbc:ID>
+                >9567f7a2-d80d-49c3-9922-0ed8a853cd69</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >381bea15-9460-49f7-a6d0-15d13059de29</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">19a0a899-e88d-452a-92ec-ad7912d20af5</cbc:ID>
+                    schemeVersionID="3.2.0">4b1ddbf3-792f-46f0-bb6c-0c86b99c51c8</cbc:ID>
                 <cbc:Description>Minimum number of references</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6752,29 +6760,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">91e8a419-5231-4747-a635-14fc304d0d76</cbc:ID>
+                        schemeVersionID="3.2.0">931b822a-148c-4878-b22c-949f02cf4e99</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >d663aca5-5f3c-4980-b825-81e1bd7db381</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">f3706229-01dd-443e-896c-1e82f160ac71</cbc:ID>
+                            schemeVersionID="3.2.0">88a52438-5efc-494f-af02-2895c1ac530c</cbc:ID>
                         <cbc:Description>Requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6788,150 +6796,151 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a44e24e9-f878-4651-9ead-e0b1387dae09</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f0f34980-ecd5-4c16-80b3-2fbab8a2e754</cbc:ID>
+                        schemeVersionID="3.2.0">a9be2931-f0a5-493d-b735-5456b32bd9d1</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >c8ec5c30-2c17-4936-abbb-392523d873e5</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7a73268c-bf50-4532-b06c-43b1ef8ec675</cbc:ID>
+                            schemeVersionID="3.2.0">ddb59a3a-c1bf-4f82-b9de-351ed4a7020a</cbc:ID>
                         <cbc:Description>Reference description</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">38bfece6-3546-463d-813e-bce2eac6d4e3</cbc:ID>
+                            schemeVersionID="3.2.0">9c517751-2162-4660-b003-1fd297e6bdfb</cbc:ID>
                         <cbc:Description>Total amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">dc87ff24-ee5e-4c61-97ed-3313ded3c9bc</cbc:ID>
+                            schemeVersionID="3.2.0">3c39c779-8292-4c37-96d4-14c9411d5aee</cbc:ID>
                         <cbc:Description>Activity of the economic operator</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c16a2d4e-5e8e-4d3e-a121-b9c291236921</cbc:ID>
+                            schemeVersionID="3.2.0">fa522465-5665-468c-97ff-2a65dd71f737</cbc:ID>
                         <cbc:Description>Specific amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">cdbad0d6-029e-48e9-8a89-59fe853f0dfe</cbc:ID>
+                            schemeVersionID="3.2.0">94ce236b-0902-46ce-b626-3133273239eb</cbc:ID>
                         <cbc:Description>Period (Start and End dates)</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d7fc28b1-8651-49df-b18f-e7b1985c7599</cbc:ID>
+                            schemeVersionID="3.2.0">04edf6f9-0cb5-4bf0-8203-9b74ff939faf</cbc:ID>
                         <cbc:Description>Confidential</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >6afa7569-e4c4-4538-be89-84a82b2a301b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >976bb531-b059-41d5-a577-226e03316ffc</cbc:ID>
+                                >2346b112-88e4-4a2d-9fcc-a18f01957d00</cbc:ID>
                             <cbc:Description>Recipient name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b3d2ad2f-ce7f-4d1f-b892-519008f33015</cbc:ID>
+                                >44ac8db3-babe-4f56-8252-f271d80bc170</cbc:ID>
                             <cbc:Description>Contact person name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >245bf718-3797-44fa-b404-0b67e5189297</cbc:ID>
+                                >353b327f-f12c-44d3-b2ff-023852542981</cbc:ID>
                             <cbc:Description>Contact email</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3f772196-21ef-4364-be35-b25faeca7b92</cbc:ID>
+                                >e8d1eb66-d68d-4f16-960a-a2b83a32194e</cbc:ID>
                             <cbc:Description>Contact telephone</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >591e5dc3-3984-4076-b58c-1e5c76949a03</cbc:ID>
+                                >2b1177b5-69fa-4da4-9784-1635d5e5b3f2</cbc:ID>
                             <cbc:Description>Is this information available online?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >de156b0e-1e69-40af-b77f-532ea34a7edd</cbc:ID>
+                                    >7ad2e145-0e38-4bb0-a439-f1961201022c</cbc:ID>
                                 <cbc:Description>Evidence Supplied</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -6954,7 +6963,7 @@
             more than three years.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6964,54 +6973,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c43a9b9d-1149-4800-82f4-924397d07dc4</cbc:ID>
+                        schemeVersionID="3.2.0">d9ed9832-f1d5-436c-92c8-17aa3b6436e1</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f30e8bf1-237a-451e-a86f-32996af02070</cbc:ID>
+                        schemeVersionID="3.2.0">ea3f1fbb-6f74-4bc5-b444-2dd379c9a947</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >f3a3d48b-ae72-48bc-bccf-99a066ff10cb</cbc:ID>
+                >69ef1e4f-5aba-49a2-9d9e-5c4bbec78649</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >381bea15-9460-49f7-a6d0-15d13059de29</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5fed1364-79e5-45a2-a5af-fed497ebf4bb</cbc:ID>
+                    schemeVersionID="3.2.0">962b4eb6-df4e-4091-b1f5-e02b2e7b6a03</cbc:ID>
                 <cbc:Description>Minimum number of references</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7022,29 +7031,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e79c6248-5405-4b60-932d-cedc4887cda6</cbc:ID>
+                        schemeVersionID="3.2.0">ecf45bbf-bd1d-462c-8aef-4c8e901b5609</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >d663aca5-5f3c-4980-b825-81e1bd7db381</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">b930ca5f-8030-4461-8d38-c464b77a6ad0</cbc:ID>
+                            schemeVersionID="3.2.0">dababd7b-040a-426d-9b2e-c7f492d3c7ce</cbc:ID>
                         <cbc:Description>Requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7058,150 +7067,151 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a44e24e9-f878-4651-9ead-e0b1387dae09</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7974939b-1c4c-4699-9a66-f868c3a619a6</cbc:ID>
+                        schemeVersionID="3.2.0">8cd38f28-b86d-434a-829b-13f1649b8445</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >c8ec5c30-2c17-4936-abbb-392523d873e5</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">74ad03ac-fee6-41ba-a0f6-ae55b08e97e7</cbc:ID>
+                            schemeVersionID="3.2.0">be2965fd-8d20-4555-ba4b-b4bc90d5d3b7</cbc:ID>
                         <cbc:Description>Reference description</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">3732318e-1fcc-4b6e-b42c-8b79a0492544</cbc:ID>
+                            schemeVersionID="3.2.0">7bbbe01b-2cfc-4350-b2a1-b1aa65f6cec7</cbc:ID>
                         <cbc:Description>Total amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1247738e-627b-4785-9471-eb905ad094c4</cbc:ID>
+                            schemeVersionID="3.2.0">34ac4171-1845-46bf-93e0-9a0b06c2f5b0</cbc:ID>
                         <cbc:Description>Activity of the economic operator</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4f059269-5f8a-4083-88fd-ea14bb417d2b</cbc:ID>
+                            schemeVersionID="3.2.0">907b115e-5a3c-41a2-b960-859788985950</cbc:ID>
                         <cbc:Description>Specific amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1672173c-10bb-4a52-a98b-fb6cc5aee342</cbc:ID>
+                            schemeVersionID="3.2.0">8d387ab4-10a1-408c-9d26-638175e9acbf</cbc:ID>
                         <cbc:Description>Period (Start and End dates)</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">91077dee-73a5-4652-90e6-0603a5998bc6</cbc:ID>
+                            schemeVersionID="3.2.0">1250aa9f-7582-4ea3-8631-bb88962e3606</cbc:ID>
                         <cbc:Description>Confidential</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >6afa7569-e4c4-4538-be89-84a82b2a301b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f496a60c-b46c-4523-9330-ecf43a0c60f2</cbc:ID>
+                                >e9b45e82-c1ca-49ed-873c-9a677c1cf303</cbc:ID>
                             <cbc:Description>Recipient name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >4bb4f5d6-c4ea-448a-a5e9-c07f813b31e7</cbc:ID>
+                                >946038ab-7ce9-4fa7-9a6c-d43ab7f0b342</cbc:ID>
                             <cbc:Description>Contact person name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e9cf8a8d-7843-486a-a461-470674988bf3</cbc:ID>
+                                >4ba5deba-d1a6-4d2c-89b7-c047d6d13f4b</cbc:ID>
                             <cbc:Description>Contact email</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >121aff15-c7c8-432b-8d3d-be83e1e9dfce</cbc:ID>
+                                >fdc7addd-2eb9-4262-adca-003e8f97a8ec</cbc:ID>
                             <cbc:Description>Contact telephone</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b52d9cf2-a0c5-483d-9ee1-42919a14686c</cbc:ID>
+                                >2329f324-68c4-493b-a691-9a07f375ca67</cbc:ID>
                             <cbc:Description>Is this information available online?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >b8766dbe-5aa7-42ed-85dc-c219ede689bd</cbc:ID>
+                                    >567e1547-c9c2-461a-a12a-13c3c2f07c85</cbc:ID>
                                 <cbc:Description>Evidence Supplied</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -7225,7 +7235,7 @@
             in.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -7235,69 +7245,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">60760025-463c-4a9b-8a5d-006dae99ea02</cbc:ID>
+                        schemeVersionID="3.2.0">66dc80ac-0d50-4ed7-8942-34c557f0e50f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">24de607a-cf21-4c41-930a-b8eff9605052</cbc:ID>
+                        schemeVersionID="3.2.0">ba4b9c3f-6338-4ab3-ab39-bd6d4b0f76da</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >d02e6d98-f48f-416f-812c-e08310e131d5</cbc:ID>
+                >f7d76e45-c718-40c1-bfed-4e7eb99ba1d5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d5136dc8-369f-4d88-bdaa-df1bf0adb236</cbc:ID>
+                    schemeVersionID="3.2.0">83aae36f-7a4d-4417-863e-8ca3765e572f</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d77afca3-671f-4052-b14c-787de8ac557b</cbc:ID>
+                        schemeVersionID="3.2.0">68508492-28e4-4039-a716-124f22a121e7</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7308,57 +7318,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2daa4027-5910-4afb-bfee-b7a591049445</cbc:ID>
+                            schemeVersionID="3.2.0">2134c970-e573-42fa-adad-18661234a39c</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2ce5da6e-7883-49b0-8967-5f13205386de</cbc:ID>
+                                >4dfaf80d-85ae-4b75-bc6f-942ab4b07689</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >ea4aaebd-f340-4bbd-b853-97a56a72dbea</cbc:ID>
+                                    >6ec117b8-0362-4410-9a36-079c5afff5b7</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >f3155ad6-2157-4998-8d8a-5de38de77e78</cbc:ID>
+                                    >c92ffe6c-6a80-4ebe-ba24-96ce004ed6ae</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -7368,113 +7379,114 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >609cc954-64be-4b4f-800a-f17589deb936</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ced36cb8-45dc-4806-9b55-eef142fa7d7c</cbc:ID>
+                            schemeVersionID="3.2.0">6149be7d-7354-4631-aef8-3a63d792269b</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >52ffcf91-3598-438f-8c3d-faf97da02602</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c258987e-6c7a-4772-864e-b0f0c086e4e1</cbc:ID>
+                                >56679c55-80f6-4ec4-86c6-fd7813e52d41</cbc:ID>
                             <cbc:Description>First name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8c7b5dff-7c89-412e-bbb2-60f0152719ae</cbc:ID>
+                                >11a278f4-5f24-432c-8cd6-b7ec3f408979</cbc:ID>
                             <cbc:Description>Last name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1657b58a-6a4f-4cc8-9f4e-5ea3ebf1830f</cbc:ID>
+                                >ad2e9e05-ec9a-4cfb-8e03-4e152f02107b</cbc:ID>
                             <cbc:Description>Profession</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c14b9403-576c-4da7-bde5-3869fba271e1</cbc:ID>
+                                >1640462c-8f35-4a8c-bcc2-18a0b1760e65</cbc:ID>
                             <cbc:Description>Experience</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8c9f0bc8-68d6-4697-baf2-65f9593eeaa4</cbc:ID>
+                                >392a47b5-e65f-476e-ad5f-c2314a85ea1b</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3b3efcc5-9d03-47e2-bc39-3e24e50fb730</cbc:ID>
+                                >68816a0b-bc0b-4937-a8d2-b500f97ca353</cbc:ID>
                             <cbc:Description>How long with EO</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >a737ec68-f01c-41d2-b3ee-688b0493ebd6</cbc:ID>
+                                    >47bc0673-5faa-47b6-b323-8b4d1b82c6a5</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >a8cac3b9-6d84-4ed4-a015-ff468923283a</cbc:ID>
+                                        >901bf57f-6a56-477f-aeb0-6f87a211bde3</cbc:ID>
                                     <cbc:Description>Evidence supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7485,83 +7497,84 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >45a67f48-d146-4faf-8239-dd6977dffe29</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">554a60f8-9208-4d6f-be69-851edc7ed94f</cbc:ID>
+                            schemeVersionID="3.2.0">1b37c46b-9808-460b-9f8c-31d6d55aea1a</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >70e28455-d0e1-47e7-9caa-ead3b7df7644</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1513aad2-bbdc-4e01-9d99-b718e4584d80</cbc:ID>
+                                >e87edaaf-e033-4f01-a8aa-3d824ae13e29</cbc:ID>
                             <cbc:Description>Name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6735b3ae-a48f-4a57-acff-f8073c8a3342</cbc:ID>
+                                >c9448b99-9bb4-42c0-a402-b7b8ac87a12f</cbc:ID>
                             <cbc:Description>Experience area</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >5a71a4ee-f48a-4820-81ed-cdb9af91a04c</cbc:ID>
+                                >23e89998-856f-447b-a2c6-7e12256c638d</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >8275d09a-7a84-413e-a568-df021a089a5e</cbc:ID>
+                                    >0a95d951-542b-48f9-b218-571d89c2cd2a</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >6febcc89-6a92-455a-bd39-4d62f79cdf4e</cbc:ID>
+                                        >2cae9642-22cb-47df-94d8-9d32b9b74474</cbc:ID>
                                     <cbc:Description>Evidence Supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7585,7 +7598,7 @@
             work:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -7595,69 +7608,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a910ef94-db22-47f0-8a9d-38fc8eb3b470</cbc:ID>
+                        schemeVersionID="3.2.0">1fa34dea-b66d-455f-b532-9366b2c9bd17</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9e154fc4-a13a-42d5-83d0-abef13415ada</cbc:ID>
+                        schemeVersionID="3.2.0">ac048acb-1a85-491e-8356-30a97469a491</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ea4af9a3-82e3-4678-b6e7-f1cdbb4a9749</cbc:ID>
+                >59069401-b1ad-4ada-95c9-5610ae29a5fa</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">b307e828-9f88-4b11-b236-513b8cacf3b8</cbc:ID>
+                    schemeVersionID="3.2.0">ee7a0cce-3b8d-4554-9f2b-d936857ec7b4</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">158d863c-0b50-4f4e-bfbf-9a2f074ad3ef</cbc:ID>
+                        schemeVersionID="3.2.0">fa3a50a8-07a0-4985-a31f-e385f1fc60a7</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7668,57 +7681,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ddd3989c-32ce-448d-9825-d1a34b421b39</cbc:ID>
+                            schemeVersionID="3.2.0">09e97215-b4e0-4022-9a3a-42cafcf6f4ff</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >420ff719-7aa1-499c-9d17-66a3b3e61224</cbc:ID>
+                                >9ddd66b3-f19f-4d65-8399-37708de62745</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >c1766bd7-55ca-4089-8e36-a945efef2435</cbc:ID>
+                                    >dcac8046-a774-4c1e-898c-eed5cb66735a</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >1211cdd4-1ba1-4291-88b5-3a45f636b36d</cbc:ID>
+                                    >acd3a890-924f-4c37-ab3c-6e01d477c5d6</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -7728,113 +7742,114 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >609cc954-64be-4b4f-800a-f17589deb936</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">52cb3892-a852-453f-8028-d8a492ce0ff1</cbc:ID>
+                            schemeVersionID="3.2.0">a20d6c95-250d-40ec-8693-da76d0d067a0</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >52ffcf91-3598-438f-8c3d-faf97da02602</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8ee3912d-9063-4dd5-bc93-8dc74825a426</cbc:ID>
+                                >23becb50-bd44-430b-8bfc-f835b2c411f1</cbc:ID>
                             <cbc:Description>First name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2c79de34-5889-40ef-943e-a7f97dbf5a0f</cbc:ID>
+                                >432a7cca-233b-4478-8e7a-f086bf1affe1</cbc:ID>
                             <cbc:Description>Last name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >24fe55ef-00fe-4c96-a79a-1f31665029ad</cbc:ID>
+                                >bfb31970-5077-4de2-90b3-9aa6a00e2780</cbc:ID>
                             <cbc:Description>Profession</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >687fdcbb-4aea-49c9-a0e1-3425ce146e6c</cbc:ID>
+                                >1e705ca0-1c15-4197-b09c-7f459ffee594</cbc:ID>
                             <cbc:Description>Experience</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6137a661-b8ee-48f0-aff5-01e763fec631</cbc:ID>
+                                >d1f79c50-a376-454a-8dbd-085b1315c898</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >d5a8566e-c494-4a72-a45c-7e66d84bc906</cbc:ID>
+                                >e1400145-e447-49da-bfdb-78c7a895fa55</cbc:ID>
                             <cbc:Description>How long with EO</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >287b4ad2-271c-4698-96ba-05a7b0a92b09</cbc:ID>
+                                    >00e5d091-62df-4f6e-8d92-cf3c7da9fccf</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >d3c9141b-67dc-4c2c-a8ca-08adcf56f0b9</cbc:ID>
+                                        >eed2b33d-7966-4cc9-9624-bddff851a3e3</cbc:ID>
                                     <cbc:Description>Evidence supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7845,83 +7860,84 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >45a67f48-d146-4faf-8239-dd6977dffe29</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">74b4474a-756c-407d-a88a-8f5b9fa0fff4</cbc:ID>
+                            schemeVersionID="3.2.0">2b8eb75b-50e8-41c7-ab5a-0e7fa464a516</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >70e28455-d0e1-47e7-9caa-ead3b7df7644</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >60ad28b7-babe-45fd-bbfb-5badd8350855</cbc:ID>
+                                >aec4c37e-e2b7-466a-8094-8a2564a57000</cbc:ID>
                             <cbc:Description>Name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b692e5b3-3264-43a7-be42-fdb557d5ee2f</cbc:ID>
+                                >79872ca5-74fd-4e72-8226-7ce07a4299b0</cbc:ID>
                             <cbc:Description>Experience area</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >00ac472f-b3eb-4759-8dcc-e143bc085307</cbc:ID>
+                                >ceb1e981-9d00-4bde-ba9e-5ff09e75a0b7</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >d40b3d77-efed-42b3-99a5-91e74f467709</cbc:ID>
+                                    >0e49098f-13a2-490d-aead-eba0c24d1ffa</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >0744f4a0-3df4-4718-af8d-508af3f5c3fc</cbc:ID>
+                                        >b994c4f4-67ba-4424-872f-f62839b22a91</cbc:ID>
                                     <cbc:Description>Evidence Supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7943,7 +7959,7 @@
             quality and its study and research facilities are as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -7953,69 +7969,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9c46b4d7-e162-4915-b2cf-12bc8ae28eda</cbc:ID>
+                        schemeVersionID="3.2.0">4f58b796-b800-4070-8b65-cab0f3aeacd6</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b740677c-4745-4a7b-bb0f-9e891e4c629c</cbc:ID>
+                        schemeVersionID="3.2.0">14cddf8b-3157-4723-ba74-1ca3654020ec</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >0df5ad2a-d539-4b3b-80ee-a68d7fe75b98</cbc:ID>
+                >c1e37b7a-ceeb-4f1d-ad5c-cd1914952a95</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">01691be6-9687-4919-8d99-b6909a1439ce</cbc:ID>
+                    schemeVersionID="3.2.0">6cffdc54-5f39-4112-8004-df4c7e487f76</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a73f09ca-9b89-4c21-97f4-90afc8cde0c5</cbc:ID>
+                        schemeVersionID="3.2.0">1a222a9e-5a0b-4c85-b300-27915281d6f6</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8026,57 +8042,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">0a64dd4c-12f2-4fef-929f-b0e663e067b0</cbc:ID>
+                            schemeVersionID="3.2.0">beded044-9c38-4f46-b9b5-9cf26dad4af7</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >dd827b22-b32b-4323-ba97-a80467e6839f</cbc:ID>
+                                >4dbd7377-5c91-4d06-bf24-dffafb8b8e95</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >5346b4ad-fb1c-49b8-8563-e0fb58066add</cbc:ID>
+                                    >a5eec535-d82b-4db7-bb25-5ce649656c80</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >181e4c49-3107-40ea-af25-116672520b3e</cbc:ID>
+                                    >5876bb1a-72bd-45c1-a2ac-6a0702684541</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8086,46 +8103,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ac4dc2c9-b9cf-411a-bd98-ed2644ef253b</cbc:ID>
+                            schemeVersionID="3.2.0">68d199d2-c438-4f7b-a4f4-9af4ecdf6efe</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">0e106145-6dce-45ea-86e0-b44276e686b5</cbc:ID>
+                            schemeVersionID="3.2.0">2e5ed202-19d8-4fde-9183-a749c10910d2</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >fed82967-62a9-4ffc-b6c3-2572159c3416</cbc:ID>
+                                >a8e1c32b-6fdf-4550-a2b8-5dcba022a5f5</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8144,7 +8161,7 @@
             follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8154,69 +8171,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">14b27f05-74c2-41d9-ba28-1dfa9e406dd8</cbc:ID>
+                        schemeVersionID="3.2.0">26b73ecc-ae90-4822-b0c4-7ee639af119d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">53a6cfb2-92a5-4123-83f2-b3d0a9e2d136</cbc:ID>
+                        schemeVersionID="3.2.0">273b8dd7-2511-4f41-8fc2-9a250d0d76db</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >1b93f547-69be-474f-b5d8-5f2ae36aae58</cbc:ID>
+                >dd6c74bf-ff14-4215-9842-a580c5dabca8</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">65d1220e-a22e-4be3-ab5c-c4ac42d52d33</cbc:ID>
+                    schemeVersionID="3.2.0">ed8955c3-0f9c-4add-8cfc-d4819fe0351b</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1ea6dc96-67b4-4307-83dc-109184c1ae58</cbc:ID>
+                        schemeVersionID="3.2.0">ad7b611a-c39d-4a6c-bd62-811b5996b9c1</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8227,57 +8244,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">12e6dac1-d258-48a9-b3f3-39b4719ad5c1</cbc:ID>
+                            schemeVersionID="3.2.0">279978d7-7d25-4db4-a4ce-99eb0aa81e76</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1f6802e2-ccc9-48fa-b73b-31810dcecd00</cbc:ID>
+                                >516f0129-2914-4883-811a-195b83d54672</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >fd707f98-8f6e-4563-b93c-d7f009821e8b</cbc:ID>
+                                    >df505f14-271e-473a-8c89-59e3b2d55080</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >212be2e0-f378-4ad4-928c-64d1986e052b</cbc:ID>
+                                    >6280ddf1-cd40-4999-940c-5b33a8acef43</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8287,46 +8305,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a6b42ccf-f765-49a5-8926-a21feaf0367b</cbc:ID>
+                            schemeVersionID="3.2.0">c67323a5-820a-4560-9c47-6887c95fa130</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5622ba91-732b-4bbc-8557-9b66f8001631</cbc:ID>
+                            schemeVersionID="3.2.0">1208ff49-3938-4c9c-b011-8b5d01befbb6</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >9d016972-b9ea-4d31-8003-4d407de444a5</cbc:ID>
+                                >e7c7858a-bb30-4e48-8d4f-20824c5bf6b4</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8345,7 +8363,7 @@
             systems when performing the contract:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8355,69 +8373,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ed3cc98d-5a11-4ec3-9b41-656a503798e8</cbc:ID>
+                        schemeVersionID="3.2.0">ab0a2369-1df1-4c44-92f9-4f50cd9c2d26</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">307a3e60-5fed-4a76-9898-2df14fc492bb</cbc:ID>
+                        schemeVersionID="3.2.0">b1b53604-462e-4bba-8bc6-2f45137a8eb4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >91e770c9-2303-47aa-8a32-493615b8a6eb</cbc:ID>
+                >8bb964e2-6249-4f47-8645-844d8d0dc66e</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4e60a341-5c84-4446-a1ae-8e6b349d8830</cbc:ID>
+                    schemeVersionID="3.2.0">95056ec0-ca65-4a80-bd56-6d0b6ed1883d</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a8dd0bb7-c78c-4c48-8668-c736e139b9fe</cbc:ID>
+                        schemeVersionID="3.2.0">793c7c4c-1feb-48ed-b4f6-5fbe4d51a28b</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8428,57 +8446,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">42e3416b-6711-4778-bf04-3f032c7eb01e</cbc:ID>
+                            schemeVersionID="3.2.0">e8c90e53-4e7e-4caf-a54d-57027bb02353</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >47abedbb-d6b0-4edd-aaf1-67e84ddb1fa9</cbc:ID>
+                                >df4295fd-e8c0-4a63-8a88-591df73564fc</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >5aa136cf-ef72-4f42-84c7-9094f15f37d6</cbc:ID>
+                                    >2a2dfaab-0cee-4907-96fb-c731adda3f8b</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >f938b4cb-0bbf-47a2-9eed-800a167ab11b</cbc:ID>
+                                    >5ab31c5a-6252-4316-9516-4b495c3d76f3</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8488,46 +8507,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2da759b1-4fd7-41a3-ae2a-478e3ac72c54</cbc:ID>
+                            schemeVersionID="3.2.0">8f164a9c-ee72-4f10-a4d2-7f665bcbcd26</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">52968c1c-76cf-48d8-aaac-693e1545bf77</cbc:ID>
+                            schemeVersionID="3.2.0">b42dde6e-8936-4434-80bf-03d09d765fc4</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >62fb21be-7c5c-47f3-89c5-48208b2c97db</cbc:ID>
+                                >61fefbb1-6c43-44c7-abce-09dcdeb681ea</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8546,7 +8565,7 @@
             management measures when performing the contract:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8556,69 +8575,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b669ec8f-ef91-4ba2-8226-cec56e96ffbc</cbc:ID>
+                        schemeVersionID="3.2.0">2428d883-46dc-4087-905c-361ce5035ea3</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ba6c3a45-ff23-481f-8e90-fd06dc877678</cbc:ID>
+                        schemeVersionID="3.2.0">8800d53c-28c4-42ef-b553-22f9bc65e564</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >1dfd525c-069e-459c-bb83-74f22287ac74</cbc:ID>
+                >da31539e-8714-4699-af4e-5ff9b815ebba</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a6e806ee-55ac-4724-83d4-85dca1a56675</cbc:ID>
+                    schemeVersionID="3.2.0">69ff41a1-5f59-4686-a876-a9c5dbe65af6</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">df928b71-d4ee-452e-aace-fe275995b1b4</cbc:ID>
+                        schemeVersionID="3.2.0">7355b8f9-e8f5-41fe-93ba-44a86ee33f50</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8629,57 +8648,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">75a031ed-bcb5-4239-b990-5c7eb21c720c</cbc:ID>
+                            schemeVersionID="3.2.0">0f808ba7-f909-4a87-a9ac-593bb3ebf73f</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3762dccc-679f-4550-b1c4-8457e9d1a087</cbc:ID>
+                                >5b4927bb-6213-47b8-94ad-9553dcbe52f3</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >43d6eac3-a1bf-4b16-9013-498fb68beed0</cbc:ID>
+                                    >17b7a55d-2c48-49f8-82c7-1e1f5f36bd39</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >5d41e019-0a67-4a46-947f-9c61476dd32e</cbc:ID>
+                                    >fc2f4f98-3d62-4a37-b29d-be4b36c553d7</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8689,46 +8709,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">859b450e-8660-4e0f-9a8f-29d629d35d41</cbc:ID>
+                            schemeVersionID="3.2.0">eb4cc93c-716d-4895-94c4-e8f5b683c286</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c789869b-ce0f-4516-b03f-5f4017220d32</cbc:ID>
+                            schemeVersionID="3.2.0">efef85f0-7333-45dd-b31f-5b8b5d8357dd</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >97d201a3-fce7-4189-9923-d59d39bd51fc</cbc:ID>
+                                >22ee2a33-58c0-4a77-808b-84ba6234f131</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8747,7 +8767,7 @@
             for performing the contract:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8757,69 +8777,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dcd2d13e-be64-4a7e-93dc-5891c5082104</cbc:ID>
+                        schemeVersionID="3.2.0">cc13e8df-e3ea-4f7b-87f4-bd997de2c2b0</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">57b9522f-7410-4baa-b2be-f64f5675e89c</cbc:ID>
+                        schemeVersionID="3.2.0">77c26c89-726c-4a95-a06d-d6691a3d2fa8</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >8fcb9f4e-d691-44bc-a4cf-b940dd78cf1c</cbc:ID>
+                >48e05d0d-ec55-4032-8c51-7d6ebaa64147</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e83f157f-9c63-4b63-a80a-800298bf83b9</cbc:ID>
+                    schemeVersionID="3.2.0">7198efe3-36bc-48cb-96d2-6175b68dc148</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7ab33356-9b58-45fd-adaf-b51f7d390272</cbc:ID>
+                        schemeVersionID="3.2.0">8e709fd0-1d6a-4f57-aa30-13ff99f57a57</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8830,57 +8850,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a0e3ee18-daf0-4885-a7af-ae7615f79451</cbc:ID>
+                            schemeVersionID="3.2.0">430cded1-c7f2-4737-b105-a25800dee6e8</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3f3e726b-761a-4207-b2e0-a2f330d82c24</cbc:ID>
+                                >c9c335c0-ea34-4c8e-bb52-bfd81381d1af</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >06cd018b-2368-4382-8da0-3becbfed9bf1</cbc:ID>
+                                    >936865ae-4081-4beb-9760-c6263aef37f2</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >28895213-9dd0-4fcf-b19d-77df250ed9d8</cbc:ID>
+                                    >7ed672bf-221a-43d8-8059-217d5d590b67</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8890,46 +8911,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">20497b2e-489c-48df-83bf-5439046087c2</cbc:ID>
+                            schemeVersionID="3.2.0">b515f5db-0f9d-4fae-9769-568c8ab4a37c</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c40f1ffe-f301-4ecd-894d-16976a5d5231</cbc:ID>
+                            schemeVersionID="3.2.0">2f1f67f1-6692-4ad0-895c-34ec008126fb</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b9593fd7-7874-46ef-96f7-54fffb3903a5</cbc:ID>
+                                >7ec30838-de48-458e-b5b2-9116c418b432</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8950,7 +8971,7 @@
             staff.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8960,69 +8981,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8d33a0c6-19c9-4844-8f31-df7abdc35441</cbc:ID>
+                        schemeVersionID="3.2.0">100b4111-75cd-4486-be11-445a0623c6b9</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f8339606-df4d-4625-b750-2f5f0e9dd84a</cbc:ID>
+                        schemeVersionID="3.2.0">cec4c375-cb7a-4fd8-8262-ad2ab2417b92</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >c0c4a5eb-c7a8-4a5c-bdaa-3e95250d0a12</cbc:ID>
+                >544bb185-56e6-48e8-bc4d-0fd4a1886d17</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d2cadc29-07e0-46b2-a74a-a0dc4bd2e5c2</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e75fcab6-6a6c-4b61-ada2-9268fd06eb58</cbc:ID>
+                    schemeVersionID="3.2.0">101785a8-23ff-4523-8c70-8e3b3cd05f6b</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >1be6421a-0360-449e-ae7c-ce7fad73c2c2</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c01c8b90-b9b0-4db4-97e6-c65b16f78bc8</cbc:ID>
+                        schemeVersionID="3.2.0">26d92b25-4e96-41a3-8fc6-ec33341aab99</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9033,57 +9054,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6344bb80-ea5b-441c-8f32-8a0b2c691a06</cbc:ID>
+                            schemeVersionID="3.2.0">7b4f0d0c-6089-4ce9-b447-ff1aa996fe02</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1ae2f1bd-226d-418c-b0ec-3a405ccf3343</cbc:ID>
+                                >a5c6e655-c39e-413a-9128-62676ca5d4e7</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >a69915f4-f7e5-41ca-a574-1cdde7c50997</cbc:ID>
+                                    >059cca81-6f2d-4490-9524-68f48f92fa13</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >69e7165f-d27e-4d17-b669-6b942e413ca2</cbc:ID>
+                                    >97c4ee14-2346-4dd8-a026-093d71ef0057</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -9093,146 +9115,147 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5df40500-a9b7-4c15-8325-a9762224a3c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e312d823-8d92-40fc-bce6-add03c8e8432</cbc:ID>
+                            schemeVersionID="3.2.0">d9021c05-9a57-4caf-88bb-a75d75b93836</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >5476ec64-de1e-45d2-aaf1-a40a463ab7a9</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e24dd44a-8307-4a7f-8b02-4552653d74f3</cbc:ID>
+                                >64a7565f-e279-46cf-95bb-4ccc9e132429</cbc:ID>
                             <cbc:Description>First name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >7a56f36b-7c54-4e5e-93f9-d81bbff19c04</cbc:ID>
+                                >cd829d3f-6c6d-43cd-a19e-3960b0f3503c</cbc:ID>
                             <cbc:Description>Last name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0b0dd280-ed4a-41e9-9595-073b19955203</cbc:ID>
+                                >5fe8ba13-d8d8-4eac-be00-e0ae676a5d4b</cbc:ID>
                             <cbc:Description>Please describe the educational or professional
                                 qualification</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e6e3807e-acfb-4cc4-be91-4bcffadf0fc0</cbc:ID>
+                                >f78f1196-bce6-4007-b1c1-c9a3f8c06e14</cbc:ID>
                             <cbc:Description>If possible please indicate the ESCO identifier for
                                 this qualification</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >385ef971-65d7-4bcf-8fb9-7e9fbab9b082</cbc:ID>
+                                >0f0d6047-7341-4a17-be53-6623a868accb</cbc:ID>
                             <cbc:Description>If possible please describe the ESCO
                                 qualification</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f0eca5df-e233-4bee-86c5-bbec95b575c9</cbc:ID>
+                                >913159c1-8934-440b-b1be-23acb4695f6c</cbc:ID>
                             <cbc:Description>Qualification name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >fc8c4fab-b3f8-41c5-bb69-dbc29db84b1d</cbc:ID>
+                                >4f6f66e9-f946-4fb4-b057-1293a62ff049</cbc:ID>
                             <cbc:Description>Qualification number</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUAL_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >319f63a8-fe44-4b58-bfec-720a4f0351d0</cbc:ID>
+                                >48e6800b-c1fd-4cbf-a517-31b9e2752f21</cbc:ID>
                             <cbc:Description>Qualification issuing date</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >5f0433ad-443f-42e8-bbfe-742469491e74</cbc:ID>
+                                >7e025f70-6c05-4faa-a1b2-659c30907dde</cbc:ID>
                             <cbc:Description>Qualification issuing body</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >3e794cbf-721a-4a7d-9810-830d12bec768</cbc:ID>
+                                    >61adfb11-72be-4445-a391-1b0ff2851447</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >2c005838-2db0-4b4a-baeb-6241ed90a026</cbc:ID>
+                                        >4753307a-e45b-4153-83ad-87ef4528684a</cbc:ID>
                                     <cbc:Description>Evidence Supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -9260,7 +9283,7 @@
             established.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9270,54 +9293,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">fbe0f80c-690d-4f2e-98d7-dc6d68e86403</cbc:ID>
+                        schemeVersionID="3.2.0">4cb0055f-a95e-4ee0-b3af-2b25aedf8da0</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">aaf3f14c-05e9-43fa-8f86-1229cee87d4e</cbc:ID>
+                        schemeVersionID="3.2.0">6e03f00d-a27c-4e28-b259-fcdc0ae827e8</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >b53ce4f0-7013-45a0-89d1-8b203141725d</cbc:ID>
+                >74d3aec2-dd8f-4a4d-be83-893f5d8707d5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >10822ddd-9ba6-42d5-9339-de0845aeafc9</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c2ff332e-a776-451c-8188-64bfea9d81fd</cbc:ID>
+                    schemeVersionID="3.2.0">cf69808a-1980-48b5-be8c-7190a30db848</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9330,54 +9353,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ab4b8da-53ae-4394-b11b-f1ce99e94730</cbc:ID>
+                        schemeVersionID="3.2.0">ed96bf2c-3ba0-4ec1-8f6b-9e1183bf8647</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">fe56763c-90e8-4b2e-9e08-0d28bbb7b64f</cbc:ID>
+                            schemeVersionID="3.2.0">a8319984-b435-486d-a438-9641aa178fb2</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1ffff3bd-2c7a-4b3c-9774-5df68526f16c</cbc:ID>
+                                >31317dbb-e3aa-4b9e-adeb-0abf06e65963</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >98134bde-2b50-4d4e-8024-e99ef09678d3</cbc:ID>
+                                >943b35d5-c623-4d37-ad17-81e84d678679</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -9387,44 +9410,44 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a3410620-8ed3-47f9-ab90-b5b1aeeff6a5</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">177d03cb-d584-4e25-8014-3b7ea6a13307</cbc:ID>
+                        schemeVersionID="3.2.0">dba02ed2-0c21-439f-bc50-54ecc538bea4</cbc:ID>
                     <cbc:Description>Do you allow checks?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d60c2d36-6d8b-4390-90e9-ef3fe47e6c9f</cbc:ID>
+                        schemeVersionID="3.2.0">c7addd31-da76-469e-a044-fb932b364f8d</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">710bddae-405f-4283-b0f1-2e562c919393</cbc:ID>
+                            schemeVersionID="3.2.0">87db6831-c7ba-4e29-a74f-f45a453ac4b4</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -9442,7 +9465,7 @@
             were as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9452,54 +9475,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">83ef2c86-fdee-42cd-be5b-8148e94ba18e</cbc:ID>
+                        schemeVersionID="3.2.0">bb02a423-be43-496a-9561-7f21663522be</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">350fb260-737a-4808-8352-0720d6bd0a89</cbc:ID>
+                        schemeVersionID="3.2.0">f5789164-605c-4ca9-bf2a-7d044e20bef1</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >668e98f1-54da-4ebe-87b9-d2974181393b</cbc:ID>
+                >7b1f02d1-5d3d-42f6-89bb-a9b6e4f9d7ed</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7f7949a8-dbe6-496c-a9f6-6f05b8648bad</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4ae33590-07bb-42c2-9ca9-e10dbcfe6b5a</cbc:ID>
+                    schemeVersionID="3.2.0">c83d8904-969d-4f71-b9c1-c5a8dce2377b</cbc:ID>
                 <cbc:Description>Minimum number of years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9509,11 +9532,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">839322e4-9fa5-446a-8d7e-d44f2b1d857c</cbc:ID>
+                    schemeVersionID="3.2.0">d7980263-9969-4be0-a1c2-0683206bb2d1</cbc:ID>
                 <cbc:Description>Additional information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9524,54 +9547,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d82cee39-bb2f-4329-85b9-a31510149274</cbc:ID>
+                        schemeVersionID="3.2.0">7818b73e-d333-4144-9005-4ef772c246b9</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5ee75638-2902-41c8-ad56-f01385fd0e1e</cbc:ID>
+                            schemeVersionID="3.2.0">42bfb841-7199-413d-b1da-0dfd6e50bf4f</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >bcc5d810-f296-4df4-9bea-e01177b050b8</cbc:ID>
+                                >9afbf6f7-79d4-45fd-a02a-f32d695b1b6b</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >373bd59c-d0b0-4acf-860d-4bb1782d7774</cbc:ID>
+                                >e674f7e0-ecaf-4bf5-a727-0949c7daa1fc</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -9581,53 +9604,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >96defecc-7d32-4957-82e9-aad5f3c5b736</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e7d6f4b-e50f-45d0-b499-8632efb98f61</cbc:ID>
+                        schemeVersionID="3.2.0">106c44ec-701f-4339-b37e-8b6fc4498c09</cbc:ID>
                     <cbc:Description>Year</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9df90193-41d0-4a26-bc34-18d536a6c48f</cbc:ID>
+                        schemeVersionID="3.2.0">7dc48e11-a13e-404c-9cd2-3714f49c72cb</cbc:ID>
                     <cbc:Description>Number</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">73190003-37a4-4dc9-9965-a584b1769a58</cbc:ID>
+                        schemeVersionID="3.2.0">3fb8d468-85b8-401b-8260-927147763c45</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">145a9020-3303-4418-bd64-cfc03553f57d</cbc:ID>
+                            schemeVersionID="3.2.0">f95479c5-712c-4f94-a535-3c094069053b</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -9645,7 +9668,7 @@
             were as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9655,54 +9678,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1da7bd1c-f974-4fc3-b0f9-e6760e01bd08</cbc:ID>
+                        schemeVersionID="3.2.0">37fe6eb2-4908-4b7f-8129-71e50b2208da</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">72bedd76-4ab9-41d8-a327-6474f287fb5e</cbc:ID>
+                        schemeVersionID="3.2.0">54dc36fb-d135-4676-a19f-eda5bb2f724f</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ffa4f7b1-4a94-42c9-a19b-429be07f119d</cbc:ID>
+                >7060b04f-c573-4de5-b275-3c312e17cf45</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >6ad0b7e3-9946-4e62-be00-d6c1ee70d785</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d386500d-dd39-4eb3-b366-57196d291035</cbc:ID>
+                    schemeVersionID="3.2.0">f8b6a13d-470b-43be-bf2f-4add93788609</cbc:ID>
                 <cbc:Description>Minimum number of years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9712,11 +9735,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">1d2fdea1-81df-45b2-90d4-968fbb67cb6a</cbc:ID>
+                    schemeVersionID="3.2.0">018582b7-2b45-4acd-b4d0-be114dcebd4c</cbc:ID>
                 <cbc:Description>Additional information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9727,54 +9750,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d50ed7bc-20d2-4a0e-84fd-6976ede4ec41</cbc:ID>
+                        schemeVersionID="3.2.0">1917561a-e8d6-4f80-801a-973891b143c8</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d028cedc-8584-4428-bdc7-441409b05d0c</cbc:ID>
+                            schemeVersionID="3.2.0">acca3680-b2ec-47e0-a402-a4c95c06cac6</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >cb92956c-ca31-4eca-87a0-9848cf4c26a0</cbc:ID>
+                                >2e1e7211-c0e2-459e-aeba-5a33b3f9b52c</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >bee72d50-e210-4d1b-ad63-391a877ae26e</cbc:ID>
+                                >032a4895-6ff4-41d7-a65d-db26c7c3dba5</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -9784,53 +9807,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >96defecc-7d32-4957-82e9-aad5f3c5b736</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">50a2de1f-1441-4572-8d1e-36fb8b041989</cbc:ID>
+                        schemeVersionID="3.2.0">9cb71905-5af0-4cea-b1ff-bb751d102f1c</cbc:ID>
                     <cbc:Description>Year</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b1977039-27fa-415d-9fb2-30ba811667fb</cbc:ID>
+                        schemeVersionID="3.2.0">8ba62f36-e6c3-4296-be7f-9a247f339d58</cbc:ID>
                     <cbc:Description>Number</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dc84b69c-3ca9-4741-b72d-e779935628b0</cbc:ID>
+                        schemeVersionID="3.2.0">5d70f836-3f9b-457f-9eba-4c8eeeb1f852</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">b06a2778-bce8-4eaa-af21-53247a73042e</cbc:ID>
+                            schemeVersionID="3.2.0">4b527425-1c77-45d6-9863-5297422c0188</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -9851,7 +9874,7 @@
             subcontractors, see Part II, Section C above.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9861,91 +9884,91 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">08f749b5-5781-407e-b4c0-7ac2903230c1</cbc:ID>
+                        schemeVersionID="3.2.0">dcfb5657-87e5-4164-bed4-73413e0b28f4</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a809fd4c-3170-4307-9f9b-e5ecb90b2eaa</cbc:ID>
+                        schemeVersionID="3.2.0">19396697-a40e-4a21-b678-d19661856ab1</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >57a7cc0f-d3f6-4270-ad02-99dc7906a78a</cbc:ID>
+                >a03a44a2-4a82-4931-8132-f113a788fcd5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2d8dc8c6-941f-4e4d-978d-5713bc78aed3</cbc:ID>
+                    schemeVersionID="3.2.0">6807fdc4-77c0-4d93-8eb0-1831c43b8e83</cbc:ID>
                 <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">08e53319-3b26-405a-9e48-e91ed101f069</cbc:ID>
+                        schemeVersionID="3.2.0">64f1c9e9-1049-4cc9-9780-c1a557951af1</cbc:ID>
                     <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">dbcd4a32-0688-403a-ba91-1440f046d52d</cbc:ID>
+                            schemeVersionID="3.2.0">d3a9e267-3105-46e1-b959-08b376927dde</cbc:ID>
                         <cbc:Description>Name of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5f79e744-e75d-4184-b75d-27b25a904cd7</cbc:ID>
+                            schemeVersionID="3.2.0">8bbda05a-b3ef-4669-95c3-1a2d2b27cf9b</cbc:ID>
                         <cbc:Description>ID of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0"
                             >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
@@ -9955,44 +9978,44 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >575f7550-8a2d-4bad-b9d8-be07ab570076</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">57325f91-9fd7-460b-840f-d90ab840b868</cbc:ID>
+                    schemeVersionID="3.2.0">e7accf56-b96f-4dea-b4cd-283564048582</cbc:ID>
                 <cbc:Description>Please specify</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5702afb7-cedc-48db-9325-a5c9ac349fea</cbc:ID>
+                    schemeVersionID="3.2.0">646fd0b3-b30a-4c5f-bcde-5a7f5e82703b</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a66c93ee-4b47-4dce-bf18-2a8c8b6d3da7</cbc:ID>
+                        schemeVersionID="3.2.0">75b1fda5-d237-4f34-ba4d-b60aee2c822b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10011,7 +10034,7 @@
             to be accompanied by certifications of authenticity.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10021,91 +10044,91 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e9d06679-4214-4d9a-9e91-4cd83957f17c</cbc:ID>
+                        schemeVersionID="3.2.0">7ccd3412-1835-4fe0-94ea-deb24ad664d1</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ec8e3bde-19c3-461e-aa8f-3b601cdff44c</cbc:ID>
+                        schemeVersionID="3.2.0">64e86ba5-3bdb-4057-9a03-0fc06ec1120e</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >fc43bd90-4620-4554-bc5d-ef5cbc2fc379</cbc:ID>
+                >8ea25328-dfdd-4f52-a7d4-c46684bb7002</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">1ec17851-76bf-4437-8d4f-fe11d585d127</cbc:ID>
+                    schemeVersionID="3.2.0">09f2c0e7-28fc-4e7c-a54f-2825646f6c5d</cbc:ID>
                 <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0662597f-a9f7-4f3d-ab56-6c6523ff9ec8</cbc:ID>
+                        schemeVersionID="3.2.0">6847dd49-bc90-4a1b-9653-639f1d705821</cbc:ID>
                     <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">78d258fa-46ab-4727-af93-f6fe88b993d8</cbc:ID>
+                            schemeVersionID="3.2.0">76e15bf0-49f2-4ae8-80f7-8912d5179a44</cbc:ID>
                         <cbc:Description>Name of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e7ad1759-3ed8-4513-9eb9-a5eb9cc233b9</cbc:ID>
+                            schemeVersionID="3.2.0">ba46a279-9c42-4cc0-812c-025c7f0ad2af</cbc:ID>
                         <cbc:Description>ID of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0"
                             >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
@@ -10115,44 +10138,44 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >cb73544d-e8bb-4cc6-819b-b8e04f1e240e</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">7f901dea-30d9-4595-bdf5-a19b741d251a</cbc:ID>
+                    schemeVersionID="3.2.0">885eaeb5-016e-4531-967c-f43728948304</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c50aea51-67b8-482c-9ae2-b59e78976e82</cbc:ID>
+                    schemeVersionID="3.2.0">e30b0d27-bbe0-484d-8a98-cd4c24748262</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4b7e3bcf-8609-4545-994c-f8c18b1e966c</cbc:ID>
+                        schemeVersionID="3.2.0">b7ceec15-a590-4c23-9a85-5dbc33b8bb53</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10171,7 +10194,7 @@
             certifications of authenticity where applicable.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10181,91 +10204,91 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1fd2cd3b-05a5-4e45-854c-18ba0c1480da</cbc:ID>
+                        schemeVersionID="3.2.0">91fc39fa-8183-4550-ac10-cd63ea54e068</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8962eacd-a927-43b7-8938-167a8558bb51</cbc:ID>
+                        schemeVersionID="3.2.0">28c3b196-7633-466a-a443-40f4d7603d47</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >b4e5aeb7-59d3-4226-84f4-7bd113110e3c</cbc:ID>
+                >7c59c3b1-7f96-44ba-9799-0086d86d1490</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">97ddd9f3-cd6f-40ee-bc90-439961571e8f</cbc:ID>
+                    schemeVersionID="3.2.0">870b6b8f-79c9-4ac7-bb55-780a58be1884</cbc:ID>
                 <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a56b9052-2e1c-4d76-ab02-5bd9049a93d8</cbc:ID>
+                        schemeVersionID="3.2.0">4643441b-a76a-4cbe-bf85-5509e6b501ce</cbc:ID>
                     <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">244428a3-29f9-4ddc-b230-ade55b584b8f</cbc:ID>
+                            schemeVersionID="3.2.0">c7fd228c-a3fd-4cd4-8576-d98c04693394</cbc:ID>
                         <cbc:Description>Name of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">8a2d9ff2-7ff8-4b14-9cf5-f78774ab13c0</cbc:ID>
+                            schemeVersionID="3.2.0">18b2afb8-d7c2-4e81-9921-40c5260daa39</cbc:ID>
                         <cbc:Description>ID of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0"
                             >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
@@ -10275,44 +10298,44 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >cb73544d-e8bb-4cc6-819b-b8e04f1e240e</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">94ff50b9-8a8d-4f1d-978b-437bec7d88f2</cbc:ID>
+                    schemeVersionID="3.2.0">8574f792-a494-4578-b33f-a1eb26638a06</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c80267c1-6e58-452d-b3d9-694232fb20b3</cbc:ID>
+                    schemeVersionID="3.2.0">b2702c1b-fa19-4711-b547-98d63c0e1f47</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b9df4351-cf8f-4758-b966-44546a87f04f</cbc:ID>
+                        schemeVersionID="3.2.0">ee2553ab-b7f9-4cc3-8dee-919be5efa3cf</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10332,7 +10355,7 @@
             notice or ?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10342,54 +10365,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b00dca2d-aa42-4643-89dc-a65291ccc394</cbc:ID>
+                        schemeVersionID="3.2.0">79a89696-d570-41c9-a0fe-bcf818f3de0d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">eb95686a-6fa3-48e3-9d41-f4e99abbabd1</cbc:ID>
+                        schemeVersionID="3.2.0">5411e769-fe3e-4b02-8fe3-5d994685008a</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ae37f845-ae9e-4cad-9065-5fa1d1f052a6</cbc:ID>
+                >812f75d4-39b4-4eaf-b953-9ad947b32ecc</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >612d99eb-ea3b-4275-ac06-0db05e039c8c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">7bcf6673-afce-4e58-afac-6e2ba293c1b0</cbc:ID>
+                    schemeVersionID="3.2.0">369c3132-7fd5-42d3-8bb2-886c5ba9d59b</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -10400,54 +10423,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">26387307-bb64-41d9-a98c-c09f95d01f7c</cbc:ID>
+                        schemeVersionID="3.2.0">e9e340e4-ae75-4a50-93fc-ae23114217df</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4d94e15a-39a5-497b-aeda-97afcdd37205</cbc:ID>
+                            schemeVersionID="3.2.0">59e78cf5-8a1b-45d2-a2d0-56edf0e23004</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0149e588-dfe1-42e0-b8c7-ce56d5b197d0</cbc:ID>
+                                >cc03f6ba-fa9c-4d29-b441-d7ee8bdfc7a0</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1f28d638-98ca-4611-a92b-7597ddd74840</cbc:ID>
+                                >839521c2-7f97-496e-bbf1-1b810b5812c0</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -10457,30 +10480,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4887c3d7-05fc-4e3e-b066-f338910f0c4c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3775b0b8-bf7c-4ccb-bb88-d9b6e3159614</cbc:ID>
+                        schemeVersionID="3.2.0">2bbdc521-f830-462a-ab7a-c6394298d24a</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >83f2f79e-0455-4918-89ff-d7829e8bf758</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">edaffe7f-83cc-443b-89b6-2e348ac1177f</cbc:ID>
+                            schemeVersionID="3.2.0">b8d27c00-f130-40ee-89d0-30d7818bfd6a</cbc:ID>
                         <cbc:Description>If not, please explain why and state which other means of
                             proof can be provided:</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10488,29 +10511,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5ea5abcf-5253-4150-9576-372e20669b7e</cbc:ID>
+                        schemeVersionID="3.2.0">8a49f999-f430-4b0b-8c3c-ecf3389cd6f0</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">09b6a09b-351b-4036-9ae1-e7d46f463c19</cbc:ID>
+                            schemeVersionID="3.2.0">e4627f18-08cd-4f86-877a-d0b207de3435</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10530,7 +10553,7 @@
             persons?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10540,54 +10563,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7cd056f0-54e5-4fdc-bcb9-75d91ad86dc2</cbc:ID>
+                        schemeVersionID="3.2.0">7def3972-4174-46c9-8b61-8911be28c950</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bd324580-d05f-4481-8d3b-70e151e2d65c</cbc:ID>
+                        schemeVersionID="3.2.0">eb5ed47a-c4b5-4cee-9f83-e3c69d3209b3</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >2d3545dc-cf65-4b2c-9400-b31625c69e5d</cbc:ID>
+                >b4217f03-0d23-473e-b4bc-a4b0d8767a14</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >612d99eb-ea3b-4275-ac06-0db05e039c8c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0cdcecc2-5dc1-42f9-8d5b-108d57d5092f</cbc:ID>
+                    schemeVersionID="3.2.0">25e0c670-f6ae-4f05-b7e4-46061761d19b</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -10598,54 +10621,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7fcccfc9-5b05-4581-8933-0eedbdfca388</cbc:ID>
+                        schemeVersionID="3.2.0">2ccfe198-c170-4702-a02e-9f338149268e</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">28e954ea-ec72-4902-8ae3-1e4b83f972e2</cbc:ID>
+                            schemeVersionID="3.2.0">a8887830-35d7-4255-b9dd-3fb6ef423474</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3fd20674-fbbc-459b-a48c-a140b0855b85</cbc:ID>
+                                >ebd9f1eb-c72c-4c9e-9e84-a65d5cc1d396</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >9390d721-b490-495f-8975-ec2440d74946</cbc:ID>
+                                >f88f75ed-19d1-4281-b460-c5206a3e256b</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -10655,30 +10678,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4887c3d7-05fc-4e3e-b066-f338910f0c4c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">018a1043-69fd-468b-b1ed-d310de679c50</cbc:ID>
+                        schemeVersionID="3.2.0">0e46a27c-71d3-45a5-936e-ae6e2a8a146c</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >83f2f79e-0455-4918-89ff-d7829e8bf758</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2bd50b04-16d8-4bc3-99ae-db41d04d968b</cbc:ID>
+                            schemeVersionID="3.2.0">3a34a944-4790-403d-9304-ca0012b20ec3</cbc:ID>
                         <cbc:Description>If not, please explain why and state which other means of
                             proof can be provided:</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10686,29 +10709,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a7d86f76-72fa-479d-9caa-5d7bff7beb8a</cbc:ID>
+                        schemeVersionID="3.2.0">dc7930dd-63a6-46cf-a803-80c5ef7e405d</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1ea38df2-dbbb-4c3f-ace8-4c785814fb66</cbc:ID>
+                            schemeVersionID="3.2.0">ce1e0365-7f64-4448-a1ac-930a951ce7dd</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10728,7 +10751,7 @@
             environmental management systems or standards?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10738,54 +10761,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ca9e274-d777-4b16-8084-e434641ab839</cbc:ID>
+                        schemeVersionID="3.2.0">4405774c-e392-4a8e-8847-6c8c8b346cb8</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e94e885-4de6-4102-b4d8-3aacd2f6d688</cbc:ID>
+                        schemeVersionID="3.2.0">5e2b22bc-c112-45b7-b858-3d86d1532519</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >47c8af91-cbc7-4b48-9500-6aba4e48d289</cbc:ID>
+                >66b91bb2-b3d3-4a48-ad21-7a44b73ea901</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >612d99eb-ea3b-4275-ac06-0db05e039c8c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f67b4953-0d40-44c7-86f7-0ac088104d03</cbc:ID>
+                    schemeVersionID="3.2.0">d01de757-805b-420b-8054-077e2af5bf22</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -10796,54 +10819,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ab8809a-c171-4415-add8-29f901f7a618</cbc:ID>
+                        schemeVersionID="3.2.0">d2691b1a-188d-46b9-9c77-1f8abe23ad1d</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">573f7333-74c5-41e4-b2be-969a086148b7</cbc:ID>
+                            schemeVersionID="3.2.0">ef87d818-ce94-4e0d-888a-14933990d884</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6d02ffe0-b258-4261-8d40-7ecc4756fadb</cbc:ID>
+                                >fc80055b-f16d-4df5-bbf3-ccd0f8da9256</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >4eb3baa0-5a12-4c20-9838-98cfb5fed5bd</cbc:ID>
+                                >5c0fae04-d865-44ff-92e7-8b54ec787e07</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -10853,30 +10876,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4887c3d7-05fc-4e3e-b066-f338910f0c4c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5757b23d-2338-4501-a66c-0f4566c7f4ac</cbc:ID>
+                        schemeVersionID="3.2.0">ef2cff6f-a7a4-4535-ae72-07dcbf7cb00b</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >83f2f79e-0455-4918-89ff-d7829e8bf758</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">33031d84-1618-409c-bbbb-efd5192b9bad</cbc:ID>
+                            schemeVersionID="3.2.0">d0bf766c-c6c1-4908-8225-ca4143703b66</cbc:ID>
                         <cbc:Description>If not, please explain why and state which other means of
                             proof can be provided:</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10884,29 +10907,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f6266b0e-57d3-4a7d-bdda-c9c00f4ac873</cbc:ID>
+                        schemeVersionID="3.2.0">da48c330-2c79-44bb-bd44-0fef2d9edfec</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">14229f75-d88f-42aa-8af6-02bc8d9cfa5a</cbc:ID>
+                            schemeVersionID="3.2.0">0125c3f3-4c88-4de4-ac47-356d39f87251</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10925,46 +10948,46 @@
             contract in the context of sheltered employment programmes?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >6febbe4a-e715-427c-a2b1-19cfabadaef0</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9ed07bbd-a1fc-4ded-8e31-985466fa1598</cbc:ID>
+                    schemeVersionID="3.2.0">2ee86253-d7db-4f97-8037-0e8bb73e2004</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a5e33369-e2b5-45f7-9969-ddb1c3ae17c8</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">57a84af0-cfb3-4041-bf21-85f7f40b7577</cbc:ID>
+                        schemeVersionID="3.2.0">ffa8d4a4-364f-4c6b-93ac-6b53b8c5e71e</cbc:ID>
                     <cbc:Description>What is the corresponding percentage of disabled or
                         disadvantaged workers?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERCENTAGE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">83984206-5656-499c-9c3a-1b0cbc44ae26</cbc:ID>
+                        schemeVersionID="3.2.0">4eb908ba-87ba-4697-b2ae-e48a62f304a3</cbc:ID>
                     <cbc:Description>If required, please provide details on whether the employees
                         concerned belong to a specific category of disabled or disadvantaged
                         workers?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10972,29 +10995,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">52308e50-47aa-4527-8189-36fada14f264</cbc:ID>
+                    schemeVersionID="3.2.0">f0738b16-7c94-4810-b964-de2664c85aaf</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8ac53510-c8ed-4cbd-886c-9453c4a3c2c4</cbc:ID>
+                        schemeVersionID="3.2.0">a79c90a9-0c26-45c8-bc3a-c9e1aeb8720b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11012,72 +11035,72 @@
             national (pre)qualification system)?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >ecb5127b-9018-4fb8-8327-a6a7a2c73195</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4fd61ee6-0105-4d79-9289-3bb006b59045</cbc:ID>
+                    schemeVersionID="3.2.0">0320cd97-541b-444b-9879-584f6b625635</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >dc4acf0c-c761-40d0-b031-4ee1f224be5c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">574bb4da-d992-4eae-9f53-8dfc13c115bf</cbc:ID>
+                        schemeVersionID="3.2.0">25bc373c-9734-4743-a328-c1dd909a4a77</cbc:ID>
                     <cbc:Description>Please provide the name of the list or certificate and the
                         relevant registration or certification number, if
                         applicable</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0256b5c2-75e6-4bbb-a1cb-71a2f40e37e2</cbc:ID>
+                        schemeVersionID="3.2.0">8f1dd729-2402-4ca2-9530-dff339a4ebb6</cbc:ID>
                     <cbc:Description>If the certificate of registration or certification is
                         available electronically, please state where</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">99dce1b8-d98a-4bf8-af21-42abe8e1e642</cbc:ID>
+                        schemeVersionID="3.2.0">f669234b-fedc-4f1e-9b5e-1c7dff9f6f24</cbc:ID>
                     <cbc:Description>Please state the references on which the registration or
                         certification is based, and, where applicable, the classification obtained
                         in the official list</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >92e44d3b-af8e-4a29-91a8-24d27aa27fee</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7a887325-ecab-4490-b17d-a0d6e71e090a</cbc:ID>
+                            schemeVersionID="3.2.0">c7abbda8-2fda-4896-811f-889417529d3e</cbc:ID>
                         <cbc:Description>Does the registration or certification cover all of the
                             required selection criteria?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11085,19 +11108,19 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >59e6f3ef-15cd-4e21-82ac-ea497ccd44e2</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">87261b18-1a53-4e15-b707-9fa240bb4638</cbc:ID>
+                        schemeVersionID="3.2.0">d9ce77c8-fa90-4081-a189-606d09f392ad</cbc:ID>
                     <cbc:Description>Will the economic operator be able to provide a certificate
                         with regard to the payment of social security contributions and taxes or
                         provide information enabling the contracting authority or contracting entity
                         to obtaining it directly by accessing a national database in any Member
                         State that is available free of charge?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11105,29 +11128,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">29bd09c6-b19c-4269-a187-038d2e9b58de</cbc:ID>
+                    schemeVersionID="3.2.0">705bb585-9645-40c4-90ec-e9d1d6f09f76</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f81e6d13-48de-472a-84ed-8a1583b1ced8</cbc:ID>
+                        schemeVersionID="3.2.0">ca5c8e7a-561c-4f0e-ac6f-cc548855a257</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11144,55 +11167,55 @@
             together with others?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d939f2c6-ba25-4dc4-889c-11d1853add19</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d1321c04-45e0-408d-8426-5103639eae07</cbc:ID>
+                    schemeVersionID="3.2.0">5482ae7b-7f24-4af9-87c5-bb655b2011fb</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5663c5a-d311-4ae4-be14-1575754be5f2</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c3cf2f11-9cdc-4f27-aaf3-8ce64dba951d</cbc:ID>
+                        schemeVersionID="3.2.0">9b76d9dd-58c6-4b93-b96e-cb27adbfdc64</cbc:ID>
                     <cbc:Description>Please indicate the role of the economic operator in the group
                         (leader, responsible for specific tasks...)</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">CODE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1dd5da12-f819-4cf0-820b-a25b795b942f</cbc:ID>
+                        schemeVersionID="3.2.0">b6a791af-474d-45bc-9806-8a73c8909987</cbc:ID>
                     <cbc:Description>Please identify the other economic operators participating in
                         the procurement procedure together</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4eab7108-8fbf-4a44-8e8a-82f27d73f5e1</cbc:ID>
+                        schemeVersionID="3.2.0">30624f7f-8d5f-47e7-815b-811a009a79b3</cbc:ID>
                     <cbc:Description>Where applicable, name of the participating
                         group:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11200,29 +11223,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2924e0a5-feca-48ca-9369-7b4a0c914abd</cbc:ID>
+                    schemeVersionID="3.2.0">955c3429-fa76-4b07-bca3-a1d654086beb</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7a488534-54ea-4297-8521-66235ff845bf</cbc:ID>
+                        schemeVersionID="3.2.0">b99cfa50-f63c-4f1e-81f5-ed12f0cd9b6f</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11240,43 +11263,43 @@
             (if any) set out under Part V below?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >289f39b3-2a15-421a-8050-a29858031f35</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">cb2d3973-ea8a-4653-9717-dcf6dd05b6d7</cbc:ID>
+                    schemeVersionID="3.2.0">3e51b2f9-16dd-40d5-b0a2-41adc1d7d807</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >50e9a74e-969e-4d79-8e19-8af71cb7c54a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ba1c2ed-af2e-4cee-9775-8b4e959bfd94</cbc:ID>
+                        schemeVersionID="3.2.0">47a15e92-4c8c-4c0e-a69b-6f08df9d2617</cbc:ID>
                     <cbc:Description>Name of the entity</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1ba5eaee-4cc9-4dba-bc13-976bddb180b3</cbc:ID>
+                        schemeVersionID="3.2.0">2e0206cb-345f-4fb1-a373-56f3e451183a</cbc:ID>
                     <cbc:Description>ID of the entity</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11284,29 +11307,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4a304c79-5427-4b15-b927-2272581b38d3</cbc:ID>
+                    schemeVersionID="3.2.0">011ecd2c-f7a7-4c56-b3b4-0d977ea37610</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d073db97-df1e-4708-aeba-295077e85120</cbc:ID>
+                        schemeVersionID="3.2.0">f88908e7-dc8a-4c7f-a077-b4462dd6eb97</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11323,43 +11346,43 @@
             to third parties?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >289f39b3-2a15-421a-8050-a29858031f35</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ed8407f8-0bd0-4590-97d6-c43b770db434</cbc:ID>
+                    schemeVersionID="3.2.0">d75d2420-9aa8-4eb6-a124-1acdefc466b6</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >50e9a74e-969e-4d79-8e19-8af71cb7c54a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5262ca83-3860-49af-885d-9ac75bc10849</cbc:ID>
+                        schemeVersionID="3.2.0">bb1ab9ff-fa3e-413a-a275-efc8a8fbe214</cbc:ID>
                     <cbc:Description>Name of the entity</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0574ea3f-2fcf-45b4-a770-619ea5d2a0e5</cbc:ID>
+                        schemeVersionID="3.2.0">3b236e1e-ad4e-44c0-ae59-08f7bc78cb0a</cbc:ID>
                     <cbc:Description>ID of the subcontractor</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11367,29 +11390,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">84258667-1d46-41c6-8bf2-e901367889fc</cbc:ID>
+                    schemeVersionID="3.2.0">b24f8e7a-b387-4744-954b-cbf8c941f259</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e71c74da-3de7-4ad2-87b8-d6e48c6e5158</cbc:ID>
+                        schemeVersionID="3.2.0">b476c9a2-172b-408c-8cfd-6397f28eb111</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11407,34 +11430,34 @@
             candidates in the following way:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >ecc69670-f428-4446-908f-689568ca0d0d</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">6b80e481-32a6-4093-9ede-426c2c964c73</cbc:ID>
+                    schemeVersionID="3.2.0">fa9aa377-ede2-4515-82af-c9363b27cd8f</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f13754df-7e15-4155-aaa6-7ca6407baa47</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c0073ff9-350a-4cbf-89b9-06dfa1efee17</cbc:ID>
+                        schemeVersionID="3.2.0">ba7737d7-dcbf-4e44-bd22-6395984be1f3</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11442,29 +11465,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a0478ef4-b8d6-4873-bf67-b360d1f94cfb</cbc:ID>
+                    schemeVersionID="3.2.0">25b2e4f7-5508-455f-881a-608922cc28d9</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">113df3a1-d42b-43d1-9973-c01de4db264b</cbc:ID>
+                        schemeVersionID="3.2.0">64af9418-8797-4396-bcb6-1a5c5f24e50e</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11481,43 +11504,43 @@
             Enterprise?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0aef9d77-7bcd-411e-b49e-f6b6cd47312c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5b8435df-19c6-4d20-89c7-fc0d1cb4f17e</cbc:ID>
+                    schemeVersionID="3.2.0">d617d4c4-8444-4e26-85d9-4c262092bb06</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >5ee707fa-21fa-4966-9c1e-b9b4a98b6e98</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a50c818f-2c1c-46c5-9740-a2699d2bffd6</cbc:ID>
+                        schemeVersionID="3.2.0">e956215e-36b2-431a-85bd-3d91e08e41bb</cbc:ID>
                     <cbc:Description>Number of employees</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">008859f7-8773-4686-8c9a-7998cf2fcb96</cbc:ID>
+                        schemeVersionID="3.2.0">c742b72f-f79b-4a49-8f1a-17634a491b64</cbc:ID>
                     <cbc:Description>Turnover</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
diff --git a/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl b/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl
index c40e5913..0d5c5758 100644
--- a/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl
+++ b/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl
@@ -522,10 +522,10 @@
 
 		    <!--ASSERT -->
 <xsl:choose>
-         <xsl:when test="(false() or not(@listID != 'CriterionElementType'))"/>
+         <xsl:when test="(false() or not(@listID != 'criterion-element-type'))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="(false() or not(@listID != 'CriterionElementType'))">
+                                test="(false() or not(@listID != 'criterion-element-type'))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
@@ -536,7 +536,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listID = CriterionElementType'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listID = criterion-element-type'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -988,10 +988,10 @@
 
 		    <!--ASSERT -->
 <xsl:choose>
-         <xsl:when test="(false() or not(@listID != 'PropertyGroupType'))"/>
+         <xsl:when test="(false() or not(@listID != 'property-group-type'))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="(false() or not(@listID != 'PropertyGroupType'))">
+                                test="(false() or not(@listID != 'property-group-type'))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
@@ -1002,7 +1002,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listID = PropertyGroupType'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listID = property-group-type'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -1078,10 +1078,10 @@
 
 		    <!--ASSERT -->
 <xsl:choose>
-         <xsl:when test="(false() or not(@listID != 'ResponseDataType'))"/>
+         <xsl:when test="(false() or not(@listID != 'response-data-type'))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="(false() or not(@listID != 'ResponseDataType'))">
+                                test="(false() or not(@listID != 'response-data-type'))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
@@ -1092,7 +1092,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listID = ResponseDataType'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listID = response-data-type'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
diff --git a/validation/ESPDResponse/xsl/ESPD-criterion.xml b/validation/ESPDResponse/xsl/ESPD-criterion.xml
index 7ac99edc..7b789c49 100644
--- a/validation/ESPDResponse/xsl/ESPD-criterion.xml
+++ b/validation/ESPDResponse/xsl/ESPD-criterion.xml
@@ -17,22 +17,22 @@
     <cbc:ProfileExecutionID schemeAgencyID="OP" schemeVersionID="3.2.0"
         >ESPD-EDMv3.2.0</cbc:ProfileExecutionID>
     <!-- The identifier of this document	generally generated by the systems that creates the ESPD -->
-    <cbc:ID schemeAgencyID="DGPE">ESPDREQ-DGPE-e3f1a3d73d</cbc:ID>
+    <cbc:ID schemeAgencyID="DGPE">ESPDREQ-DGPE-267da1aec2</cbc:ID>
     <!-- Indicates whether this document is an original or a copy. In this case the document is the original -->
     <cbc:CopyIndicator>false</cbc:CopyIndicator>
     <!-- The unique identifier for this instance of the document. Copies of this document should have different UUIDs -->
     <cbc:UUID schemeID="ISO/IEC 9834-8:2008 - 4UUID" schemeAgencyID="XXXESPD-SERVICEXXX"
-        schemeVersionID="3.2.0">9b39741a-8641-4879-be82-c624c15d7d2f</cbc:UUID>
+        schemeVersionID="3.2.0">48b84e63-6b61-410f-bf8e-700638318c6a</cbc:UUID>
     <!-- The reference number the contracting authority assigns to this procurement procedure -->
     <cbc:ContractFolderID schemeAgencyID="DGPE">PP.20170419.1024-9</cbc:ContractFolderID>
-    <cbc:IssueDate>2023-03-07+01:00</cbc:IssueDate>
-    <cbc:IssueTime>10:49:23+01:00</cbc:IssueTime>
+    <cbc:IssueDate>2023-04-12+02:00</cbc:IssueDate>
+    <cbc:IssueTime>17:43:52+02:00</cbc:IssueTime>
     <!-- The version of the content of this document. If the document is modified the element cbc:PreviousVersionID should be instantiated -->
     <cbc:VersionID schemeAgencyID="OP" schemeVersionID="3.2.0">3.2.0</cbc:VersionID>
     <!-- The type of the procurement procedure; this information is provided by eForms and the concret notice per procedure. e.g. open = 	
 		In open procedures any interested economic operator may submit a tender in response to a call for competition. -->
-    <cbc:ProcedureCode listID="ProcedureType" listAgencyID="OP" listVersionID="3.2.0"
-        >open</cbc:ProcedureCode>
+    <cbc:ProcedureCode listID="Dummy_ProcedureType" listAgencyID="OP" listVersionID="3.2.0"
+        >Open</cbc:ProcedureCode>
     <cac:ContractingParty>
         <cbc:BuyerProfileURI>DummyValue</cbc:BuyerProfileURI>
         <cac:Party>
@@ -86,125 +86,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">598aefff-28c6-4586-afe2-9ae8efb6c7fa</cbc:ID>
+                        schemeVersionID="3.2.0">5dc453f3-dca2-4571-8374-4ab189f2503e</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">80d0d9d2-2fb8-42d0-b785-ae9ea7b36781</cbc:ID>
+                        schemeVersionID="3.2.0">89af5a35-18af-4331-b194-d81bf37a8e35</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >7216fde1-8317-422c-9cee-4fac2c5c4189</cbc:ID>
+                >5cc654ca-d28b-495d-a90d-6aae3fdc06b4</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">cde460b1-9ade-4e52-8602-26056a1cf54c</cbc:ID>
+                    schemeVersionID="3.2.0">a2ff22b8-461e-4683-8ff7-8c37fe01221a</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c1b19342-ccf5-4e95-814d-243fd80297ac</cbc:ID>
+                        schemeVersionID="3.2.0">86dbbabc-54c0-422e-bf1a-40e2376b7803</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e21fe514-e08f-4fd9-acdf-717e159e9bca</cbc:ID>
+                        schemeVersionID="3.2.0">bb7edfac-20ef-4e99-8ebd-8db525dd43d9</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">855927c9-6313-4a15-a28b-8642c3111bfe</cbc:ID>
+                        schemeVersionID="3.2.0">306b0a66-99da-4138-bed7-4dba14c4be28</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">484b688f-7de9-4c71-b5a3-acde938c6f1a</cbc:ID>
+                        schemeVersionID="3.2.0">42b68c72-d46e-41d6-be05-bf6e0691144c</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5c9588a9-4d05-471c-8797-eb456240a14a</cbc:ID>
+                            schemeVersionID="3.2.0">4ce2ef78-7239-46b9-b00c-a9c633d37018</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6a9e96f3-8581-4229-9c6f-c266dc25ff72</cbc:ID>
+                                >d4af76a7-0b1c-45aa-8525-dca9f70e8198</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -214,29 +214,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5616debc-48c4-48eb-966e-a928eb3bdd84</cbc:ID>
+                    schemeVersionID="3.2.0">f177fa0d-f1cf-4dd3-8ba7-a627b76cc049</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4fee2c79-d60a-4a37-9f5c-1a548b3600e3</cbc:ID>
+                        schemeVersionID="3.2.0">8d9844bc-50d5-4b7d-85ff-998464a4679b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -268,125 +268,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">56dadea9-7e75-490b-901e-8ddbf271e09d</cbc:ID>
+                        schemeVersionID="3.2.0">75d7e6d4-47ca-4ce2-913d-9dc5a7469a7c</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4c5a5ed3-5ecc-4a52-92a4-66d6943b99a1</cbc:ID>
+                        schemeVersionID="3.2.0">cfaf5d03-a76a-4ed6-b160-2edfe9b21bf0</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >77b97f29-5867-4c0b-bcc8-704f15a4442f</cbc:ID>
+                >7fb92d7f-b349-4b10-b3ef-95cc79a69092</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f9a62470-b9ca-4aa1-b3ae-cfab7530b6b0</cbc:ID>
+                    schemeVersionID="3.2.0">15cb5567-9800-400d-bbc7-5db4e559cd31</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ca3fe54d-3ae4-46bb-8eeb-96852c5a2419</cbc:ID>
+                        schemeVersionID="3.2.0">e662fabf-c2af-4482-89bb-a5ca37644294</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e69abbcf-418a-47dd-a384-d9ae07aa60d1</cbc:ID>
+                        schemeVersionID="3.2.0">c1a81e0d-e61b-4bdd-9676-c9386f13763d</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">679c889f-6db5-43cd-b297-2d1fac283c30</cbc:ID>
+                        schemeVersionID="3.2.0">aadb1b87-2f53-496a-b138-b3ac56fd86bc</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3ac60757-0132-45a4-b579-d345e8378be5</cbc:ID>
+                        schemeVersionID="3.2.0">62092407-c1d9-4067-aaee-ba7d4f6d3877</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">10c89a88-9399-4ce5-ad15-fdeda0b66a38</cbc:ID>
+                            schemeVersionID="3.2.0">23213dfe-ef01-432d-b32f-376e20184f5e</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >dc3e0233-fc20-4619-bc58-0a48172eb8ba</cbc:ID>
+                                >4824afbd-3e9c-4c34-94cc-f93a859c70fc</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -396,29 +396,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">3cc0433b-d2de-4271-88f1-e39c889714ee</cbc:ID>
+                    schemeVersionID="3.2.0">709af0b8-5c9f-4b5c-bdb0-ab4c8931f981</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4b566d3b-6d41-415f-b5d1-84b06f45e585</cbc:ID>
+                        schemeVersionID="3.2.0">c75896aa-996d-4bf4-9a4c-75fa0639782b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -446,125 +446,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8b38582d-84d6-4510-97d4-93df206a357a</cbc:ID>
+                        schemeVersionID="3.2.0">2498e379-889d-42da-b717-0fdf350b1716</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c76fd416-47ad-4c18-ac09-ed2cbe9d9e6f</cbc:ID>
+                        schemeVersionID="3.2.0">2c121c08-9f8d-4599-9e21-d5fd980aa827</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >36ac3a88-5d60-4fe8-977e-5776a7ed6d70</cbc:ID>
+                >d6e61980-dc61-440c-bdb2-1ad60d07dcb9</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">28b728a3-0460-4ad8-8011-a1ddefcca9e8</cbc:ID>
+                    schemeVersionID="3.2.0">08a45dd6-d289-40a8-9560-bc0d5de1974f</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3d01b222-bf88-4b8c-9228-770436fc0bd4</cbc:ID>
+                        schemeVersionID="3.2.0">ab726227-2bf5-4bf0-a0d7-195b477d9e3f</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cd1213d8-8eb1-42db-9f07-1003e0e60108</cbc:ID>
+                        schemeVersionID="3.2.0">cd7439ba-9fdb-4131-868c-fcaeea89b653</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bbe07c80-2f28-4727-9ced-99b565ad3dbd</cbc:ID>
+                        schemeVersionID="3.2.0">cf916ca9-b57f-44b0-8b70-ff8458bda662</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ade81de9-3388-412c-bae4-764499a6af14</cbc:ID>
+                        schemeVersionID="3.2.0">2687549d-b040-4dd5-8079-58520edac97e</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">13828459-caad-43b7-b2c0-06eba19b8721</cbc:ID>
+                            schemeVersionID="3.2.0">5851bd21-84b2-4540-9106-208d66c15f7f</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1d96ac9a-3d4f-49ac-a9ea-c3d55a314b23</cbc:ID>
+                                >8778d320-1ef1-4d62-b89b-b41e0632391f</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -574,29 +574,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">30adb1ac-1905-4c12-a54f-a4212c2c7850</cbc:ID>
+                    schemeVersionID="3.2.0">b3360bfc-8951-4b5c-a8ef-975daa2828fb</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e8a7723-9b66-433a-989f-1708e6109fcc</cbc:ID>
+                        schemeVersionID="3.2.0">4c40f5d0-8a5b-4ceb-95e2-bbf2ca9a9dab</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -626,125 +626,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6ae67392-bc26-4e84-8cb1-297c3ac09538</cbc:ID>
+                        schemeVersionID="3.2.0">897d0663-5423-4616-ba5e-b821357f8302</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7a08afd2-409b-4faa-8d0b-eae69149ed8a</cbc:ID>
+                        schemeVersionID="3.2.0">68dc7309-2789-49f7-ad4f-92254ee12f0b</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >73ed7f28-349e-47aa-9869-a872006b0e56</cbc:ID>
+                >cb577798-a46b-4d17-a089-56ba73bcf750</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">17139b9c-3a53-4bed-a262-c995d39189d5</cbc:ID>
+                    schemeVersionID="3.2.0">cdc6734e-66d4-4481-b16b-da061c3ddaad</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1bc0c100-2f04-4189-9826-e0c4f40ad912</cbc:ID>
+                        schemeVersionID="3.2.0">6b16cae4-e209-4f5d-b980-9c4494f55b7e</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2f6f6880-8ffe-4722-9f3c-3fd896b74f4d</cbc:ID>
+                        schemeVersionID="3.2.0">a3f4be19-2dd6-4144-a759-c9d6faef26c9</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e997bfcb-f2a7-4265-99ec-0908b0ce4110</cbc:ID>
+                        schemeVersionID="3.2.0">6bab74fd-dd74-403b-ba12-ae1fc48e9201</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">68d93dee-8e48-4d43-89dd-1e268e1b1b31</cbc:ID>
+                        schemeVersionID="3.2.0">92710423-2f0d-42f4-a8ab-ac159767deb7</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5296074c-bfbe-4193-9197-43cd78b53575</cbc:ID>
+                            schemeVersionID="3.2.0">997f5625-1d9d-4bb8-bf97-f4532b8bf727</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >d9569ad9-1388-4e4c-995e-2bd3a8dc9177</cbc:ID>
+                                >44ab50fd-668c-44ce-a423-e7242cfa4269</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -754,29 +754,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">31b251b5-9ea7-464d-92c1-d28014160373</cbc:ID>
+                    schemeVersionID="3.2.0">6afbcff1-751b-47f6-a889-f1218546a221</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5d6bd9d5-5e02-4c23-b1e2-908223115cad</cbc:ID>
+                        schemeVersionID="3.2.0">149a7896-f8fc-45e0-9771-3392b8c6543c</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -806,125 +806,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">92c39e1b-e320-4baf-8dd8-96a0db325c7e</cbc:ID>
+                        schemeVersionID="3.2.0">e8d3a058-c249-419e-897f-9d6a26cfd8ab</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2e039e0f-8589-49f3-b168-e88763430f89</cbc:ID>
+                        schemeVersionID="3.2.0">52ade97a-d64a-4791-a954-3b743f6a5a1b</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >c4197f4a-9f0f-4088-bc33-974e1be8e742</cbc:ID>
+                >77051e64-ab2a-498a-af14-554777ed0896</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0278acda-37e2-4acc-a4f9-703c5f80d631</cbc:ID>
+                    schemeVersionID="3.2.0">37be6104-427d-47b7-a24b-bfbcfa44ab67</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">64723b78-c876-4bc0-b837-99a18de50f75</cbc:ID>
+                        schemeVersionID="3.2.0">1e71e076-9256-4408-a787-bc9e53678368</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">09ad0eb0-10e5-4278-9c11-b76396d1cec2</cbc:ID>
+                        schemeVersionID="3.2.0">ee0ccef8-abcc-4d52-a66f-b5cd6ebd86c7</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">12cfc762-6312-4278-9710-fb57d22cc775</cbc:ID>
+                        schemeVersionID="3.2.0">cc413d9b-69f8-46bc-8379-5292ec2920be</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e6bbea4-281f-40fe-9681-7f08831605d2</cbc:ID>
+                        schemeVersionID="3.2.0">4135b0e8-2972-4ff9-be29-f5279b14da6d</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">8c17d544-fdb0-473d-b2a6-be6e84017511</cbc:ID>
+                            schemeVersionID="3.2.0">12bed2ca-6e0f-49da-966f-0774ef6095d8</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e3b8b501-302c-42c7-aae5-68d51a360457</cbc:ID>
+                                >957d8d72-78e9-4f06-ba6f-52eace91195e</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -934,29 +934,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f9d20e26-15cf-4788-aaab-3154cfec22a4</cbc:ID>
+                    schemeVersionID="3.2.0">369862c9-512a-4898-be13-e0b55773e835</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">37295cf2-a448-49f2-afd8-14525a1a24bf</cbc:ID>
+                        schemeVersionID="3.2.0">89a3cb70-2d2c-4913-ac3a-ce4feaa37558</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -986,125 +986,125 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bc6f04ab-7a3d-4634-865a-31c75d2c9647</cbc:ID>
+                        schemeVersionID="3.2.0">899b3999-48a8-4916-bd88-fb81768b29d0</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f28ad9aa-dd84-401d-802f-21aa23674ff9</cbc:ID>
+                        schemeVersionID="3.2.0">8bbe192e-1882-4327-b81b-cd2a6fce00dc</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >94447eb2-36c6-4786-b1f9-c980a4434fdf</cbc:ID>
+                >34df53ef-51b0-4507-bc65-b8256f653051</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7c637c0c-7703-4389-ba52-02997a055bd7</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">220c1186-888f-4dfa-9cd0-68bc28808b4a</cbc:ID>
+                    schemeVersionID="3.2.0">58e1f4fe-9f84-4d63-9e17-ea098dae81d4</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5276600-a2b6-4ff6-a90e-b31fe19dae41</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d56ca523-0baa-4fe8-b427-25f2a8cbe14d</cbc:ID>
+                        schemeVersionID="3.2.0">b965299b-6298-4f7a-befc-7d52d6fed2bd</cbc:ID>
                     <cbc:Description>Date of conviction</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8925952a-e28c-48b0-a95d-4aa7698c587c</cbc:ID>
+                        schemeVersionID="3.2.0">b11be1ac-a69a-4bb0-97ed-a1a6ede56b7d</cbc:ID>
                     <cbc:Description>Reason</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a86b45cc-02b6-4ed3-88fd-7cbf689391fe</cbc:ID>
+                        schemeVersionID="3.2.0">be9feae6-9a1e-41b4-9f6a-9174b3603c04</cbc:ID>
                     <cbc:Description>Who has been convicted</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">743d007c-7a38-48ca-81ff-0b530d7c1d6f</cbc:ID>
+                        schemeVersionID="3.2.0">b1e6fc26-d54b-4fd6-b962-0d313d6ef929</cbc:ID>
                     <cbc:Description>Length of the period of exclusion</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">72f83fcd-4af2-407b-812a-b858dc04d054</cbc:ID>
+                            schemeVersionID="3.2.0">37a5a832-1042-48ac-8323-6911ef1f9f69</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c2da2566-bded-425c-9a16-401256906e16</cbc:ID>
+                                >bb3d1833-a468-46ac-9a1c-02aa79fb0d9b</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1114,29 +1114,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">250f1031-d62b-45d5-9847-a31fd68eec72</cbc:ID>
+                    schemeVersionID="3.2.0">cd3a68fc-9cac-497a-be07-7db74afa5c5d</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">edb7bb01-c660-4d19-bafe-d96c6b611078</cbc:ID>
+                        schemeVersionID="3.2.0">a6d4d91a-a41c-4279-afa4-54626b53c720</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1161,54 +1161,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">48015ec7-3ad1-4986-b32c-c403c98b5654</cbc:ID>
+                        schemeVersionID="3.2.0">236dffe7-26c5-4bf1-96cf-21f9d89b37d6</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d119ccca-4f1b-489e-84ff-f9912403ffa2</cbc:ID>
+                        schemeVersionID="3.2.0">2578d66d-0fe7-4ab8-bbde-d70e7ba7ffd9</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >e7f5d261-f262-4991-92a4-a6d737061fc5</cbc:ID>
+                >56fc054a-b5b8-4c6d-b15b-1a0884896d83</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">16e95264-7b72-4def-9102-479b6d06517b</cbc:ID>
+                    schemeVersionID="3.2.0">3ded0637-05a2-4373-b859-3fc0c50c3f53</cbc:ID>
                 <cbc:Description>Threshold</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1218,11 +1218,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e2537922-24bc-462f-a876-9a72cb73fe8c</cbc:ID>
+                    schemeVersionID="3.2.0">045ce86c-77b0-4d64-8666-d29052364b64</cbc:ID>
                 <cbc:Description>Additional Information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1234,107 +1234,109 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >098fd3cc-466e-4233-af1a-affe09471bce</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">db15bc0f-4166-49a5-88d4-1771f82799ad</cbc:ID>
+                        schemeVersionID="3.2.0">9499cf68-6eca-4717-962d-c6de592310b7</cbc:ID>
                     <cbc:Description>Your answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >f8499787-f9f8-4355-95e2-9784426f4d7b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">0c1c75d4-bf1b-4508-8c2b-b03a5585e09e</cbc:ID>
+                            schemeVersionID="3.2.0">dc2d8baa-135a-4ec9-a623-7db044d32858</cbc:ID>
                         <cbc:Description>Country or member state concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">CODE_COUNTRY</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">40e4fa3d-b4e7-41d0-b0c2-d137905cdc6c</cbc:ID>
+                            schemeVersionID="3.2.0">1d909609-f0f5-4a1b-9b52-0ebb1ab312a4</cbc:ID>
                         <cbc:Description>Amount concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7c2aec9f-4876-4c33-89e6-2ab6d6cf5d02</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3a0b647f-ac16-4eb8-9be8-98696339049a</cbc:ID>
+                                >30b02a19-c9c9-4530-98cb-ba7e24dbb412</cbc:ID>
                             <cbc:Description>Has this breach of obligations been established by
                                 means other than a judicial or administrative
                                 decision?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >3cb7abf1-662a-4756-b61c-7bc716c1fafc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >f0c096f9-f9ef-4f71-8f36-78ef60febe5c</cbc:ID>
+                                    >d429f71b-58d4-4232-9e60-22d8107e8059</cbc:ID>
                                 <cbc:Description>Please describe which means were
                                     used</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                         </cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >fc57e473-d63e-4a04-b589-dcf81cab8052</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >266d74aa-ec26-47ba-882d-34992857ff70</cbc:ID>
+                                    >db8f38f5-8403-4795-81dd-ced0be6219ef</cbc:ID>
                                 <cbc:Description>Has the economic operator fulfilled its obligations
                                     by paying or entering into a binding arrangement with a view to
                                     paying the taxes contributions due, including, where applicable,
                                     any interest accrued or fines?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >6c3609e1-9add-4fa9-9409-62ce72ae4548</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >7384b059-e66f-4ba6-8691-8ffe53184adb</cbc:ID>
+                                        >9e41a477-7ef4-4c23-af82-44d8ca4f77a6</cbc:ID>
                                     <cbc:Description>Please describe them</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DESCRIPTION</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1343,49 +1345,50 @@
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >c882afa4-6971-4b00-8970-0c283eb122cc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONFALSE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >9ca9cd41-d086-4a58-b8e8-bd5b552670f0</cbc:ID>
+                                    >e24cab38-631a-40e1-8703-900630a2c68a</cbc:ID>
                                 <cbc:Description>If this breach of obligations was established
                                     through a judicial or administrative decision, was this decision
                                     final and binding?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >815422d6-f8a1-418a-8bf0-3524f7c8f721</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >126876b5-1941-4193-899c-5aeed3feda62</cbc:ID>
+                                        >ecb2345c-f1b2-4188-9392-335681ea05ba</cbc:ID>
                                     <cbc:Description>Please indicate the date of conviction or
                                         decision</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DATE</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >becaa987-d5dd-458c-9e14-b28bb59f4291</cbc:ID>
+                                        >72c09b27-49c4-4096-9e82-82b289e305bf</cbc:ID>
                                     <cbc:Description>In case of a conviction insofar as established
                                         directly therein, the length of the period of
                                         exclusion</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >PERIOD</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1397,29 +1400,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">24940789-14e0-41d3-950a-66b8f7af7593</cbc:ID>
+                        schemeVersionID="3.2.0">4e94827a-6851-4770-a642-b6ff8b26b311</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c61d4ae6-d798-4f69-8ce5-8b5135e89add</cbc:ID>
+                            schemeVersionID="3.2.0">fc133aea-c5b4-4790-a1e2-97a5a5845544</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1445,54 +1448,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f0df7426-fb1d-494d-9c94-71fb81780489</cbc:ID>
+                        schemeVersionID="3.2.0">7850172b-c610-4ca9-9859-4e92e7ae025d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7b780a22-d7d6-4908-9e80-115e0015efa1</cbc:ID>
+                        schemeVersionID="3.2.0">f6552141-6a72-40be-8de3-2991181015bb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >65c2a3cf-868d-4290-a9ce-c9059c5c149f</cbc:ID>
+                >0c2c2128-e823-4e36-b8c4-c6108818be34</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">335d68f9-dbf4-42ca-bd2a-5dcaa297c4f8</cbc:ID>
+                    schemeVersionID="3.2.0">cfd71496-e7f7-4464-a492-9dcfbd31ad8f</cbc:ID>
                 <cbc:Description>Threshold</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1502,11 +1505,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">70ceae29-b77c-491b-bd36-17d5a9c7d58e</cbc:ID>
+                    schemeVersionID="3.2.0">db068206-6528-498d-baed-9baa6d7fb9a5</cbc:ID>
                 <cbc:Description>Additional Information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -1518,107 +1521,109 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >098fd3cc-466e-4233-af1a-affe09471bce</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d19034bf-77b9-47df-afbe-17988ffda9fd</cbc:ID>
+                        schemeVersionID="3.2.0">6871e8da-09f6-4cae-9ddb-74bc9c4845f2</cbc:ID>
                     <cbc:Description>Your answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >f8499787-f9f8-4355-95e2-9784426f4d7b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6afd5e38-b596-424d-80f0-88ee809e9db7</cbc:ID>
+                            schemeVersionID="3.2.0">f973961d-033b-42e4-bc50-2fb8fe512a03</cbc:ID>
                         <cbc:Description>Country or member state concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">CODE_COUNTRY</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">757a501b-3533-41b5-b6dd-7fbe715414a1</cbc:ID>
+                            schemeVersionID="3.2.0">e61e7b2f-9e92-4636-a08d-e87aa7022e22</cbc:ID>
                         <cbc:Description>Amount concerned</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7c2aec9f-4876-4c33-89e6-2ab6d6cf5d02</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0396ed21-12b3-4799-9fbd-3edce871c4f7</cbc:ID>
+                                >dc7d3af1-76c4-40c6-b3f6-85ce8462d18d</cbc:ID>
                             <cbc:Description>Has this breach of obligations been established by
                                 means other than a judicial or administrative
                                 decision?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >3cb7abf1-662a-4756-b61c-7bc716c1fafc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >74279cde-54ef-40b5-96a5-3940412850da</cbc:ID>
+                                    >5a0c9758-81fc-4dd0-bf72-3f636d90e143</cbc:ID>
                                 <cbc:Description>Please describe which means were
                                     used</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                         </cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >fc57e473-d63e-4a04-b589-dcf81cab8052</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >eabda236-e0ac-46d7-bfe3-f670b137012c</cbc:ID>
+                                    >9f575d72-3860-460e-ad76-af61d2d04bb2</cbc:ID>
                                 <cbc:Description>Has the economic operator fulfilled its obligations
                                     by paying or entering into a binding arrangement with a view to
                                     paying the social security contributions due, including, where
                                     applicable, any interest accrued or fines?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >6c3609e1-9add-4fa9-9409-62ce72ae4548</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >b1286d00-71af-4a26-bbeb-497a7197c261</cbc:ID>
+                                        >6410a37f-b2df-46ce-aade-93f68df45cfe</cbc:ID>
                                     <cbc:Description>Please describe them</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DESCRIPTION</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1627,49 +1632,50 @@
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >c882afa4-6971-4b00-8970-0c283eb122cc</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONFALSE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >c071510f-a2ab-4b7d-b2b8-d1c1fb3e95a8</cbc:ID>
+                                    >f3c0d9cc-2c80-4930-92cf-210d75831f0b</cbc:ID>
                                 <cbc:Description>If this breach of obligations was established
                                     through a judicial or administrative decision, was this decision
                                     final and binding?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >815422d6-f8a1-418a-8bf0-3524f7c8f721</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >222f635f-f058-4032-829c-9019454c3377</cbc:ID>
+                                        >f56b5559-62dd-4171-bb77-ad02c4ca44d9</cbc:ID>
                                     <cbc:Description>Please indicate the date of conviction or
                                         decision</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >DATE</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >44bb8296-f4da-4ae9-92ee-786627930893</cbc:ID>
+                                        >bf5e3d61-e261-48b8-88b3-3a1fbd43b54b</cbc:ID>
                                     <cbc:Description>In case of a conviction insofar as established
                                         directly therein, the length of the period of
                                         exclusion</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >PERIOD</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -1681,29 +1687,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cfc9c608-f9a7-4cca-80de-29a75571d48f</cbc:ID>
+                        schemeVersionID="3.2.0">67fadc99-962c-4563-82ca-1676a90b3f8e</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">aa88fd58-fb60-4c61-b2b6-da322dce566f</cbc:ID>
+                            schemeVersionID="3.2.0">519b3557-80b4-487e-a6ab-71c7f06e12d2</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1729,83 +1735,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5202deba-9828-4606-a9f3-772a0f2d205b</cbc:ID>
+                        schemeVersionID="3.2.0">d50aecec-edcb-4eba-a4de-846dbe8eae58</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">555e2d84-afe4-4f01-8272-cbdd4a1d3b37</cbc:ID>
+                        schemeVersionID="3.2.0">3c5f6c66-ffbf-4c77-9946-e9cd5aebc747</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ee61041e-d040-49ad-bdc9-b9c5f6851edd</cbc:ID>
+                >44c0b595-52a3-4eac-9b44-4457a69f560f</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >976b5acb-c00f-46ca-8f83-5ce6abfdfe43</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ed2d67f3-4cfd-429f-adfc-2f86f4f896c6</cbc:ID>
+                    schemeVersionID="3.2.0">ba101918-8da3-4b6f-ba36-76f999f5523c</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >64a2102c-4af1-4ecb-97b3-0c41907ec0f6</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">359ebb36-d900-4fad-8730-2244d5b213bb</cbc:ID>
+                        schemeVersionID="3.2.0">eb16a5df-675d-49e4-a472-4a9d4ffeb78a</cbc:ID>
                     <cbc:Description>Have you taken measures to demonstrate your reliability
                         (Self-Cleaning)?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ed153f48-4816-47d1-9f26-2380fedf2e42</cbc:ID>
+                            schemeVersionID="3.2.0">568b01a6-1a88-4a09-ade4-7c68c1fd2d24</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1814,29 +1820,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9e148fef-a78f-46c9-b0ae-d8e83ee43e4f</cbc:ID>
+                    schemeVersionID="3.2.0">58656f9e-119e-4741-bd5b-5d4677312ba3</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e962ae18-160e-4c5b-91b4-0997949df4d0</cbc:ID>
+                        schemeVersionID="3.2.0">2ab33ae9-eb59-4d3a-abf3-54ae77c41bd0</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1861,83 +1867,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">51c4cebb-cc21-489c-818e-47a651250813</cbc:ID>
+                        schemeVersionID="3.2.0">6da295c0-37c6-4825-914d-fafa0bac2c0f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">85f2aa65-36d1-4221-822a-7a374d9e5422</cbc:ID>
+                        schemeVersionID="3.2.0">07278c0f-7eac-4f16-822e-a3d87acb9386</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >a9ab8a96-9384-44b4-b1f2-fa385e8fa2e2</cbc:ID>
+                >f6593e70-0583-4fe8-b67d-a6d855ee1874</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >976b5acb-c00f-46ca-8f83-5ce6abfdfe43</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5ce50493-f839-4565-8425-8bea84806e30</cbc:ID>
+                    schemeVersionID="3.2.0">b572353c-f6a8-4865-8e66-fd17c9da834b</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >64a2102c-4af1-4ecb-97b3-0c41907ec0f6</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">12a853a9-188c-4253-a921-c4d58278c8e3</cbc:ID>
+                        schemeVersionID="3.2.0">97c7657b-2d9f-424a-9631-b059405074cb</cbc:ID>
                     <cbc:Description>Have you taken measures to demonstrate your reliability
                         (Self-Cleaning)?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">eab7a0dc-d4b9-438e-920e-5ab188eb2350</cbc:ID>
+                            schemeVersionID="3.2.0">2372791c-a976-4e57-98a1-fe531b7ea9d4</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1946,29 +1952,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e21b5016-da3b-4967-ba9f-1f460c282755</cbc:ID>
+                    schemeVersionID="3.2.0">4592abaf-4e43-4c0c-914a-812e9645b7e4</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">27daab78-0fe8-4347-83c7-0a4a536326ea</cbc:ID>
+                        schemeVersionID="3.2.0">434eb37d-4f20-4b0a-b648-2898cc8e0c2c</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -1993,83 +1999,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">207c4471-86c0-4969-aef1-c5c0824c75c5</cbc:ID>
+                        schemeVersionID="3.2.0">51be482f-92e5-4056-9f73-3050981f341a</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c525bfe1-7da6-49be-a474-8f4d584e2c23</cbc:ID>
+                        schemeVersionID="3.2.0">8317b384-69d7-4eca-8e58-a1064188dc49</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >cbe3e88a-9497-4bbc-b431-f0bef2dfa2a5</cbc:ID>
+                >47d9d620-74a5-4f58-be2c-9325b900a5eb</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >976b5acb-c00f-46ca-8f83-5ce6abfdfe43</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">91673111-4207-4d2f-9076-7b4cecce9405</cbc:ID>
+                    schemeVersionID="3.2.0">17f7216f-68c8-4969-95ae-20a62dc0c3cc</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >64a2102c-4af1-4ecb-97b3-0c41907ec0f6</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2d67c1c7-4b7a-4c0a-9baa-6419612d582d</cbc:ID>
+                        schemeVersionID="3.2.0">014d69ff-afb7-4f7a-9015-aac41c239131</cbc:ID>
                     <cbc:Description>Have you taken measures to demonstrate your reliability
                         (Self-Cleaning)?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">cf59ecce-b3f7-4936-a682-5b095e8ffaa4</cbc:ID>
+                            schemeVersionID="3.2.0">9581e08b-60f4-4301-9502-32f3359f7991</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2078,29 +2084,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">aebcd069-5bee-4758-9631-5208c75ed11e</cbc:ID>
+                    schemeVersionID="3.2.0">ae42d12a-6264-40d5-815b-7a32fe8c9592</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">46d807f2-faea-4832-b0ec-18beb0596488</cbc:ID>
+                        schemeVersionID="3.2.0">e0e5eedd-4d4e-43a7-b015-29786ad5c86e</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2125,78 +2131,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1c1321f2-3df7-452a-a982-2d742a1778a6</cbc:ID>
+                        schemeVersionID="3.2.0">a0649eca-b303-43a3-8e9a-d21c967da315</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bbe85b77-5857-48a0-aaea-1da87f6f9c98</cbc:ID>
+                        schemeVersionID="3.2.0">4b172b81-779d-4744-a1b9-ea763853b0dc</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >a708e210-b6db-4faf-ab59-9bd7b25eb189</cbc:ID>
+                >2c2781fd-057f-4bc7-b5b9-7e57a3ebcc40</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">8b181f89-587a-401f-92a1-5d869756c789</cbc:ID>
+                    schemeVersionID="3.2.0">49bf5bfb-d97e-47a8-b7e7-ea48d80c60e6</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f8da1674-e724-48b3-9085-176252b09a34</cbc:ID>
+                        schemeVersionID="3.2.0">cebaf690-9ddb-4ced-980a-3a8af61b2271</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cf4a1954-dea8-44a6-97fa-56288b8af94a</cbc:ID>
+                        schemeVersionID="3.2.0">ffa2562b-7beb-439b-8654-eaf1fbe4fe18</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2204,29 +2210,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">879d0806-294e-4d04-a9a3-9fb5e9ca0a28</cbc:ID>
+                    schemeVersionID="3.2.0">f4a7f80c-7294-4b19-9d49-02d786d66698</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1047dfca-53d8-4478-a59c-2c5ecb25163e</cbc:ID>
+                        schemeVersionID="3.2.0">ec2fe4ee-c568-4b6b-a11b-6291786cbc66</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2252,78 +2258,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4538bbcb-3f0c-4169-becb-59dcda76052d</cbc:ID>
+                        schemeVersionID="3.2.0">5fabffeb-69b5-4daa-9a5a-89b8a79f7911</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a8223eaf-6a4a-4a90-a60b-ac42c1029cac</cbc:ID>
+                        schemeVersionID="3.2.0">706a10f0-cf97-4e3a-9d55-2444c509c2d4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >7a7cf5fd-994e-460d-9c1b-60baa43661a3</cbc:ID>
+                >79da0447-a35c-4368-9383-916d1d67664b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">7e814790-fce7-487d-8873-e22753a7006b</cbc:ID>
+                    schemeVersionID="3.2.0">7b96f70a-a91c-474e-8e6b-92a8704b23c0</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">172fb659-f303-4c30-af16-8c6161eed9a7</cbc:ID>
+                        schemeVersionID="3.2.0">2c110fed-cbfe-45c0-8db1-7f71f92718db</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f26330ef-6819-41d2-bc8c-f404e09733c6</cbc:ID>
+                        schemeVersionID="3.2.0">38e40a0e-244b-41b8-b11c-148c3250b51e</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2331,29 +2337,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9b0e3ada-c533-4ea8-81fd-b3eb2ba141f6</cbc:ID>
+                    schemeVersionID="3.2.0">e6f307d9-8761-4f4c-827b-67d650a82144</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b62e1364-905a-4dbb-97d7-b985450d71e8</cbc:ID>
+                        schemeVersionID="3.2.0">e2e952f4-2b88-4b3f-8025-c67070f768ef</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2378,78 +2384,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8cdb5748-a5bf-438f-9100-74f918594ff5</cbc:ID>
+                        schemeVersionID="3.2.0">4c4468d7-40a3-47b6-b4a4-614b7d5397b5</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">926c0575-4fc5-43e6-9a87-c12cfd27a7de</cbc:ID>
+                        schemeVersionID="3.2.0">973d44da-d169-427f-9c02-e05bcbcc48e3</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >0d9acc76-3ee5-419f-b016-5f3d7c6ac5e6</cbc:ID>
+                >37faaaa5-63d4-40c5-b430-c1e5c072b1af</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">844fe180-e2f0-41d0-b30a-c9c32938e274</cbc:ID>
+                    schemeVersionID="3.2.0">26bf0f8b-46cf-46dc-9c78-1976fc48b8cc</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">37f8ba89-6e8b-48f9-94f9-7c459e871ef6</cbc:ID>
+                        schemeVersionID="3.2.0">45ff8ca9-e27a-4523-9f33-21f761287ac8</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">59aad4c0-0995-48ac-8d95-65c54eca2731</cbc:ID>
+                        schemeVersionID="3.2.0">6f185c28-b388-4b2e-bda7-220146eb23b4</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2457,29 +2463,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">6f7777c8-377a-42fc-90bd-3b9a254c54c5</cbc:ID>
+                    schemeVersionID="3.2.0">b2810718-902d-4263-a337-ef98965ee53f</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6db1be7c-83a4-4444-8fb9-d20d479e1b74</cbc:ID>
+                        schemeVersionID="3.2.0">f1bd3b74-e489-4171-a2d7-88e8a8fa721a</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2505,78 +2511,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a884bb08-04b1-4198-86bb-71e323c1edb7</cbc:ID>
+                        schemeVersionID="3.2.0">fd4de2f7-43ce-4d58-83ab-d45efe76233d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a1064e48-a55b-46cf-8368-39b8d2769c0b</cbc:ID>
+                        schemeVersionID="3.2.0">0bce580e-9661-4514-a8f4-77f93ae0b0bb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >96ca3ec6-1e3f-4ebc-915e-aff9fa48353d</cbc:ID>
+                >70aad752-164c-4169-b10d-6ed530e66175</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">559982a5-948a-4771-af44-ee191fbda4e3</cbc:ID>
+                    schemeVersionID="3.2.0">37109893-dab6-4fca-b95d-af219f6fd367</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">58e632c9-2c2c-4a33-ab94-5f46166118d4</cbc:ID>
+                        schemeVersionID="3.2.0">2b46b3b6-f222-48d0-bdce-ca0644dde39c</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">54843ad5-4998-47a8-b738-fc362146eec6</cbc:ID>
+                        schemeVersionID="3.2.0">8bee0d9a-1b80-4c50-9394-3c2ae112b898</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2584,29 +2590,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ecd17197-eac4-4cc7-8db5-cf7a3d463e22</cbc:ID>
+                    schemeVersionID="3.2.0">b8d4109f-4175-4555-9368-70de0d153acb</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">70d752de-8b8c-4cba-97e1-f049b7330c0f</cbc:ID>
+                        schemeVersionID="3.2.0">eeb1ecc5-17ef-4ee7-86b6-6a8e33b52339</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2632,78 +2638,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e377d613-ba25-4913-bd04-68f87f0492dd</cbc:ID>
+                        schemeVersionID="3.2.0">604013e0-c513-4583-b871-ffad14ec31a2</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">96b33c13-d4b8-46df-a311-4548fc461eaa</cbc:ID>
+                        schemeVersionID="3.2.0">2b1a82d3-364d-4946-9b7b-1314778d5def</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >f5cf4da4-a0df-4fcc-870e-7634345acb94</cbc:ID>
+                >f244f112-043d-41af-85e5-e7f34b437c2a</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">8b284860-2e0b-415f-a9d8-c5f0b6725eb6</cbc:ID>
+                    schemeVersionID="3.2.0">fa4e8ef1-c6b6-4e6c-bc3a-396ed63dee01</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5bce5d74-1b31-48f1-85a8-fa16aecf1429</cbc:ID>
+                        schemeVersionID="3.2.0">dd3871c4-a038-470a-b237-0ccaf77f58b9</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bce2ced6-7409-4121-8ceb-bd46555a5b66</cbc:ID>
+                        schemeVersionID="3.2.0">63d75deb-c691-40df-a6d7-d5b8bc7b7eeb</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2711,29 +2717,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a9ece190-fd33-42b0-a4c5-de19ee563d9f</cbc:ID>
+                    schemeVersionID="3.2.0">cc2eba3f-0069-4b34-a091-cf86ad0e05d8</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6b6ad38c-9fc3-4833-ba65-87b45fc4da92</cbc:ID>
+                        schemeVersionID="3.2.0">092092c1-40dd-49dc-8e71-bfe6fd0b53da</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2759,78 +2765,78 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9c958577-0f32-4927-9610-fb14ce009de3</cbc:ID>
+                        schemeVersionID="3.2.0">8c527b91-cb29-4a22-a26e-2a1e8f1354a3</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3ec1dc6e-d7fb-46ce-a149-8436449eeae4</cbc:ID>
+                        schemeVersionID="3.2.0">b086e27e-427b-4260-a749-00d6c8a02adb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >e93bbe10-1204-4b2e-b21c-4d12a854c2fd</cbc:ID>
+                >12e042e9-f6f5-4da6-9bc3-513497576a5b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d91c11a1-f19e-4b83-8ade-c4be2bf00555</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">66c7f195-f187-426f-adce-c29220bdf76d</cbc:ID>
+                    schemeVersionID="3.2.0">567aeeb4-094d-4095-aa18-ad3b5d89be9b</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >aeef523b-c8fc-4dba-9c34-03e34812567b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">31bb0390-6cba-4da0-9368-32e9d47ed03d</cbc:ID>
+                        schemeVersionID="3.2.0">1b263b7d-13e8-4eba-bb46-cb3e6b69262c</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e8d88fca-11a6-4271-9568-f3b76725ad5b</cbc:ID>
+                        schemeVersionID="3.2.0">b00b2997-ca27-43d9-a5af-b8ac48532c55</cbc:ID>
                     <cbc:Description>Indicate reasons for being nevertheless to perform the
                         contract</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2838,29 +2844,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">22d62158-47ab-44a9-9325-46880571993d</cbc:ID>
+                    schemeVersionID="3.2.0">4d0bf180-17a4-458a-90ff-1ffc934e2e65</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ff94e70e-740a-46ea-b163-348c5d26904e</cbc:ID>
+                        schemeVersionID="3.2.0">4a5ea8c7-2080-444d-a8a6-00213af58643</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2884,98 +2890,98 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2235cb4f-15a3-4112-b8ed-e4d0715fb5fd</cbc:ID>
+                        schemeVersionID="3.2.0">500a61e8-6bf1-4c42-a509-1dd6125df7ec</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1c272e38-854a-4b84-abd4-3ae416feec26</cbc:ID>
+                        schemeVersionID="3.2.0">00ed4453-da0d-4a0c-8d92-bc110c70fa0c</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >bf15899e-9b0e-4ee4-a6a2-1d3a26d7786b</cbc:ID>
+                >b8bea49f-ae1b-4d32-9270-04b34402dde5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e7fca006-0bde-4faf-bc9e-796c6fbdaf20</cbc:ID>
+                    schemeVersionID="3.2.0">0620ec2d-53cb-4135-9fc4-e3332557c063</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >2cbcf978-765c-40aa-996b-b1d082485cef</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">513d5594-b28e-4882-bdf0-9d862ac9e35d</cbc:ID>
+                        schemeVersionID="3.2.0">630105b7-45e3-407a-a87e-f1d101286649</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2eb3cbb8-adfd-4f19-a043-86de337207d1</cbc:ID>
+                            schemeVersionID="3.2.0">0f326061-311e-4095-bd0e-92814011be46</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your
                             reliability</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >ac51acd6-1bb9-4eb3-a9ec-8871d8dbdb20</cbc:ID>
+                                >7cd07197-597c-4697-a508-d9b625fe60c9</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -2985,29 +2991,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a6011735-b153-4dfa-9d37-e0de8242d7b8</cbc:ID>
+                    schemeVersionID="3.2.0">1631b799-732c-4e70-aacf-bdd3ed2abaab</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">716e407c-9698-497e-b6e9-8ff89de6b8bc</cbc:ID>
+                        schemeVersionID="3.2.0">7c24b291-8133-45f8-bdf3-fc679dbb18ed</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3031,98 +3037,98 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">81460a90-4c89-49e5-93e2-2d12721ff7ed</cbc:ID>
+                        schemeVersionID="3.2.0">8725d22f-97fc-4e53-943a-0aec5b1cbd76</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a5a89b95-442f-4399-a660-641550e13258</cbc:ID>
+                        schemeVersionID="3.2.0">481671ae-846f-4108-ab8a-922d9a68bbd7</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >76a76978-0e09-4279-9eeb-67b7748ffbeb</cbc:ID>
+                >61ef43fd-9332-4bb6-8399-f86c30ffa916</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">32386bc6-72fc-4667-81b5-90d855796d9c</cbc:ID>
+                    schemeVersionID="3.2.0">6c35763d-49d8-4710-b846-410f12b773df</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >2cbcf978-765c-40aa-996b-b1d082485cef</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c2ba59c3-d63a-4af0-b653-c854a0b10a6e</cbc:ID>
+                        schemeVersionID="3.2.0">0d95113b-6f08-4e3b-bdd0-d691218e4ca5</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5ec7aa96-4a79-42e5-b1f3-439be8c41a43</cbc:ID>
+                            schemeVersionID="3.2.0">7d71d1bb-ca44-4360-ac2a-8bbb0b3129bd</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your
                             reliability</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >77df3350-e850-4821-8285-faad6e3a3c9e</cbc:ID>
+                                >f825b8d7-c40f-4248-98a7-32629876ae0a</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3132,29 +3138,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">dc0711bf-3455-4949-9b90-e1f5ed654834</cbc:ID>
+                    schemeVersionID="3.2.0">2d9e0673-b6bc-43f4-853d-ec5306379168</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b3d05d18-3d79-409d-a7e6-b9bd2fd7392e</cbc:ID>
+                        schemeVersionID="3.2.0">08b34243-c49d-48cb-a27b-bf780fe7002a</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3179,68 +3185,68 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">eda8c641-eb77-4d74-818f-0dc67cb1464b</cbc:ID>
+                        schemeVersionID="3.2.0">57cac9ef-2aa3-4536-9e88-44ae7c7d9bf5</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c292408e-e8a3-4009-9c78-7080d9c11be9</cbc:ID>
+                        schemeVersionID="3.2.0">3f341c91-dc09-4b12-bafe-462a4fc05831</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >aa429377-049c-4b51-9e3a-ee398e883d0c</cbc:ID>
+                >92255ef1-925d-4d9a-8d20-899971bf1498</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">226222fc-823e-4338-895e-c9558f872014</cbc:ID>
+                    schemeVersionID="3.2.0">6c6cc10c-5e99-46c4-840e-a20dd317e42f</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >73f0fe4c-4ed9-4343-8096-d898cf200146</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c7b4a480-7507-4750-91f0-1d32397570d1</cbc:ID>
+                        schemeVersionID="3.2.0">90e3a7e4-00e3-4a94-b712-adc1880c487b</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3248,29 +3254,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f2037f03-77d5-4801-ac23-deb70dbe7ce7</cbc:ID>
+                    schemeVersionID="3.2.0">e309eb1d-6568-4828-ba03-df0b23021cfd</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e6bee07-c345-48ea-bea1-0ec0e8c02089</cbc:ID>
+                        schemeVersionID="3.2.0">51a2a438-4298-4f8c-bb97-49be0acb619e</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3295,68 +3301,68 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">711802e5-7704-41af-95b9-a4fead677ad7</cbc:ID>
+                        schemeVersionID="3.2.0">1ab978df-786f-4088-adc0-618496aa69cb</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a477e350-4732-4c2c-acab-d82bf63bbbdb</cbc:ID>
+                        schemeVersionID="3.2.0">973a6ad3-625e-48b2-bfec-a4129a5dd37e</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >26be5eb4-36f1-4b50-9ca7-4f272da8c16b</cbc:ID>
+                >5181f6b2-9ce6-44af-bb08-a01ae0207018</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d8ce2601-6098-4b52-b494-f6285eb8b8db</cbc:ID>
+                    schemeVersionID="3.2.0">5b77cc3c-37f2-40bb-883e-7251d8ae877b</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >73f0fe4c-4ed9-4343-8096-d898cf200146</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6458cb22-7fbe-4f79-89ea-078d268b4a3c</cbc:ID>
+                        schemeVersionID="3.2.0">6a7a2a8a-e1c7-4289-a5ca-a960c3f00208</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3364,29 +3370,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e66cff5e-627e-4bcc-8a94-4d0da65e2039</cbc:ID>
+                    schemeVersionID="3.2.0">b19789e8-daa2-4608-ba33-dbbdf3f55d21</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8019ce07-fbab-4759-b177-6a7c67e37657</cbc:ID>
+                        schemeVersionID="3.2.0">63a47b02-8dc3-438d-89f8-7ee65b1e32fb</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3411,98 +3417,98 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5e3258db-ae73-44f9-878d-575f60e0defb</cbc:ID>
+                        schemeVersionID="3.2.0">26936cdf-0263-43de-b132-7ae8ef164c44</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b2a9ae09-abd6-4e71-aa97-89a31f26cbd2</cbc:ID>
+                        schemeVersionID="3.2.0">7c751ecf-bf6f-428e-9f9d-8152cbb27d5b</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >a525898b-b745-44a6-bd96-b0b3c6f98f86</cbc:ID>
+                >9aae8c57-fd08-4f0c-a7c3-5b86c128fc5a</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >67362ec7-cec3-4cb8-a38e-5d7a2a31e6d8</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ce894cfb-7b4b-46d9-9425-28428b463b40</cbc:ID>
+                    schemeVersionID="3.2.0">ab0b5fa6-d35c-4a22-98a6-e75b45b8e76c</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >73f0fe4c-4ed9-4343-8096-d898cf200146</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3fa7779c-44db-4cb0-a035-228e3a1a625d</cbc:ID>
+                        schemeVersionID="3.2.0">7b2f615f-3dd9-4d7a-9b82-3092ff4be289</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5f9f09f7-f701-432c-9fdc-c22c124a74c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1878a222-308f-4380-9987-6838c0112d1e</cbc:ID>
+                            schemeVersionID="3.2.0">1e980a14-892c-497e-bfd9-41785c652975</cbc:ID>
                         <cbc:Description>Have you taken measures to demonstrate your reliability
                             (Self-Cleaning)?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >74e6c7b4-757b-4b40-ada6-fad6a997c310</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6ce22550-93f2-4300-ba7c-973228ece3ee</cbc:ID>
+                                >9916ba80-7720-4b23-ab0c-ff40ab494cd2</cbc:ID>
                             <cbc:Description>Please describe them</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3512,29 +3518,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">755b6dd5-4b35-4be7-8cd7-8f072c21e517</cbc:ID>
+                    schemeVersionID="3.2.0">00c3553e-4edd-4582-9116-fe654e2848ba</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e03cb41f-ef59-4fba-a5d3-b3343a636f08</cbc:ID>
+                        schemeVersionID="3.2.0">62402b44-f5a3-43f1-8c39-dcd3cae09056</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3557,83 +3563,83 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dd0a6a1b-d470-4e42-ad96-0107c35f22f1</cbc:ID>
+                        schemeVersionID="3.2.0">d103f83d-7421-4ffe-9ffe-37b41c73c327</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">295e227e-cec1-49d7-aaf9-9dfb5269085c</cbc:ID>
+                        schemeVersionID="3.2.0">684c15cb-a5b9-41eb-9d2d-d4182c2a7c10</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >3a5ccb73-b62f-4ced-9c06-408ed1962097</cbc:ID>
+                >cd6d7e4f-33e8-4b7a-ad72-091729179a0f</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >f3a6836d-2de2-4cd1-81ca-fb06178d05c5</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">be53ca2e-7798-422d-a6d8-04c70c0bb1eb</cbc:ID>
+                    schemeVersionID="3.2.0">6e728048-d1f8-4dca-b243-12c699c19e4a</cbc:ID>
                 <cbc:Description>Your answer</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ae083fad-502b-4ec8-8037-12a0f7b01b4e</cbc:ID>
+                    schemeVersionID="3.2.0">2946cade-432b-41f1-ad03-65deff06ae6f</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1f6f2ebd-dd78-4867-a2bc-1f404864bf11</cbc:ID>
+                        schemeVersionID="3.2.0">72372e7d-c0ba-45ed-a31d-6c45816431ff</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3653,61 +3659,61 @@
             documents?</cbc:Description>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >42cb1551-a6d5-4b4d-ae7b-1c5744ea2e8c</cbc:ID>
+                >34b5d234-54d9-407b-acee-9f12dacf05df</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >8d79d5f7-dc21-45e9-b188-e02008b854e0</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">833b08b5-10a1-4d66-8a76-863b445bd6fc</cbc:ID>
+                    schemeVersionID="3.2.0">d0d824a0-c53f-4b05-8e64-5af5934c49d8</cbc:ID>
                 <cbc:Description></cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4f5088db-ae29-46fb-b642-30240aa2248a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c74213bc-dcbf-40a5-83b0-caa4ec5276da</cbc:ID>
+                        schemeVersionID="3.2.0">ea75e124-3e89-41a3-9783-c54f30739632</cbc:ID>
                     <cbc:Description>[Text describing the national criterion]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a92418d5-af27-4aed-a64a-ae701ce08ec3</cbc:ID>
+                        schemeVersionID="3.2.0">3d45c069-a156-4094-85c1-7a1aac74c2d8</cbc:ID>
                     <cbc:Description>[Type of evidence from e-Certis]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2a098c0b-d314-4948-abfa-5e9c8816f747</cbc:ID>
+                        schemeVersionID="3.2.0">c7069018-ef93-471e-a4fc-a47adb6e2da9</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3715,29 +3721,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9b223e68-f217-4359-b8c8-cac26a873107</cbc:ID>
+                    schemeVersionID="3.2.0">aa3ec91e-0a51-4434-829c-0bfe07a726e5</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">cd5c413d-aed3-43f8-b783-bdcb06ba0405</cbc:ID>
+                        schemeVersionID="3.2.0">1ae1027e-5eb0-4ae8-84bf-8acc6cf5e440</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3756,7 +3762,7 @@
             in that Annex.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -3766,113 +3772,114 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">347ecb6d-b156-4ef1-8c07-3fc038129a54</cbc:ID>
+                        schemeVersionID="3.2.0">32d774eb-4efc-41b4-abac-17a68f47b33f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">709cf4e6-efd4-4b04-b739-ba6e7a94770f</cbc:ID>
+                        schemeVersionID="3.2.0">593e6933-b2a4-4da0-9d91-595c8b623f8c</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >81db4338-2ab9-433e-89b7-05ff6fb1adb1</cbc:ID>
+                >835df845-ede5-4473-9982-c8468e79393c</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >b01d8f8f-ceac-4b47-b7aa-88cdeb630465</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ba208c20-cf04-4f05-a440-8454c4491f13</cbc:ID>
+                    schemeVersionID="3.2.0">a7aabe0d-11b3-4297-8a4c-748ddbda5bfe</cbc:ID>
                 <cbc:Description>occupation</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">CODE</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                <cbc:ExpectedCode listID="PleaseSelectTheCorrectOne" listAgencyID="OP"
-                    listVersionID="3.2.0">[occupation Code]</cbc:ExpectedCode>
+                <cbc:ExpectedCode
+                    listID="http://publications.europa.eu/resource/authority/occupation"
+                    listAgencyID="OP" listVersionID="3.2.0">[occupation Code]</cbc:ExpectedCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">810171fd-0a44-485e-bc8f-5c07d74695ff</cbc:ID>
+                        schemeVersionID="3.2.0">3e7f2d57-bf29-4835-aee3-5b74cf7967a5</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">820e1777-4e61-4538-ab34-35a59266c710</cbc:ID>
+                            schemeVersionID="3.2.0">a1a3ea8a-c269-4f44-86a7-380166c8bf96</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3a30bf14-7b13-4e19-8750-3fbe35737f92</cbc:ID>
+                                >ee6c8456-d130-482d-9948-b20c9a1d9542</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >194fdf78-5bed-43cb-873c-c59aae24421f</cbc:ID>
+                                >0d539cc2-dc9f-48f5-8f90-99da636afdbf</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -3882,75 +3889,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e4f18d1b-ad4c-4b3a-afd2-30da6b28a5b4</cbc:ID>
+                        schemeVersionID="3.2.0">4373af68-2745-441f-ba3d-9fce4a6b7829</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">76d94727-b7d6-4db3-8879-e2b22410213b</cbc:ID>
+                            schemeVersionID="3.2.0">ad421670-83ac-4d6e-869b-b9a1d86cf142</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4d6a3ed8-a487-421f-a16f-2219bc6339fe</cbc:ID>
+                            schemeVersionID="3.2.0">34069c58-a03e-4bf9-9f32-c874ebcd6fc3</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">9138d6ef-da4f-46d1-b601-1340f8598c39</cbc:ID>
+                            schemeVersionID="3.2.0">622a5d08-f828-4293-881f-395681406471</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >5e3148b8-c0f3-4e1a-b336-7b1e79dd9dc9</cbc:ID>
+                                >f060d45a-33f8-4628-b29c-9a9d423c97e6</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -3971,7 +3978,7 @@
             Annex.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -3981,54 +3988,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">06bbb1a4-377a-4ce3-9d9d-bc188aa4e4ef</cbc:ID>
+                        schemeVersionID="3.2.0">c678c9bb-c7b8-4500-bfdf-addd142bae1f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b137e0e5-a67e-4e56-9545-74c03cc7247f</cbc:ID>
+                        schemeVersionID="3.2.0">aee86794-f57c-4c9d-baaf-64d487f83b19</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >f4e32450-7b05-4887-8f01-017fd8dbf277</cbc:ID>
+                >96751a49-64a5-451e-88c4-a19de79e3d2b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >a53561d5-6614-4dbe-987e-b96f35387f46</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2e52258e-5a8a-452b-b7d0-b599f7328848</cbc:ID>
+                    schemeVersionID="3.2.0">76b0722b-5d6d-42e1-8bfe-4d9819c58ab6</cbc:ID>
                 <cbc:Description>Register name</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4038,11 +4045,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">cbe4fa46-fa2e-418b-93b9-d321aadcb6ab</cbc:ID>
+                    schemeVersionID="3.2.0">2ad6f7dc-df36-410d-9263-31adf76b2160</cbc:ID>
                 <cbc:Description>URL</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4052,54 +4059,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5d0293ff-0e6a-429d-8b0b-8b6d20c30238</cbc:ID>
+                        schemeVersionID="3.2.0">52626f5e-ad9c-4bf9-aec0-3f6cc2232d53</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">52ff4ba4-0ef2-482e-8aa1-3d82787c695d</cbc:ID>
+                            schemeVersionID="3.2.0">60150dcd-d0bb-46e5-b95e-8ea0d82fa1ec</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >49623f7f-c51d-4aeb-94b6-422a728fdd94</cbc:ID>
+                                >83b0ff9b-a11f-43f8-8878-b61fdeee664c</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2d9dede5-0600-42f9-b7d4-75dcf795a176</cbc:ID>
+                                >5e1cd67d-796c-42ce-8e1e-5593c365ec46</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4109,75 +4116,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9a29e42c-aa1d-43e5-833c-09498d11dd5a</cbc:ID>
+                        schemeVersionID="3.2.0">3b327cb5-dc89-4e92-a777-c3b67d05b5a2</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">bae7768e-db5c-45cb-84c3-8143f26ce6ca</cbc:ID>
+                            schemeVersionID="3.2.0">bdce8929-d17b-4ce0-a2eb-c1a8e5edb354</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">59965fb8-5733-4ae3-b1d0-e1c84b89e4cc</cbc:ID>
+                            schemeVersionID="3.2.0">acd4dd06-97ef-4393-9225-9e31fedd6dc3</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">dcd1e5e4-224f-48e1-8a89-b78cd111255d</cbc:ID>
+                            schemeVersionID="3.2.0">8da01e2e-47b9-439c-89fc-c91c38e24e5e</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >a8345924-263a-4d98-9104-c687b93cf902</cbc:ID>
+                                >b841f8e1-de7e-468b-b2d6-b9f556f964e5</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4197,7 +4204,7 @@
             economic operator?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4207,49 +4214,49 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">82d45e41-9ed0-490a-b831-69cfa751e6fa</cbc:ID>
+                        schemeVersionID="3.2.0">54e1e3ee-f254-4da4-88cd-82361ffe16eb</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b21b0d91-7da0-41dc-956e-3292489e30bf</cbc:ID>
+                        schemeVersionID="3.2.0">be013655-66d5-4cb6-8459-5db0e7917a27</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7696fb3f-9722-43b8-9b91-ad59bb4b8ad2</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">370ba339-a877-467f-8ca7-0e406efbb465</cbc:ID>
+                            schemeVersionID="3.2.0">fa9c689f-5759-491a-aa62-295be0aa288f</cbc:ID>
                         <cbc:Description>If yes, please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">72b44482-fb8d-460e-97d1-dec72d883f9d</cbc:ID>
+                            schemeVersionID="3.2.0">9d11ceec-8154-4be2-91c1-7965c9ee5266</cbc:ID>
                         <cbc:Description>Indicate whether the economic operator has
                             it</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4257,29 +4264,29 @@
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >d87d4f91-b964-4454-bb27-19a573ad6b28</cbc:ID>
+                >3dc7f885-11b1-477b-91ab-9a08e690446c</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >a53561d5-6614-4dbe-987e-b96f35387f46</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">6095070b-85e4-4aef-b3e2-fbd1115cb536</cbc:ID>
+                    schemeVersionID="3.2.0">1dd1bb08-0839-4d2f-ac7b-de580b519ed6</cbc:ID>
                 <cbc:Description>Register name</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4289,11 +4296,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e00f9954-f600-4e7e-8aed-d968e915f788</cbc:ID>
+                    schemeVersionID="3.2.0">e148dbd9-7fa0-41f1-8052-811be3e3d373</cbc:ID>
                 <cbc:Description>URL</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4303,54 +4310,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">265464c3-55e6-4a4f-a6f0-cfc5429e283f</cbc:ID>
+                        schemeVersionID="3.2.0">6b7b7325-4629-4cc6-af99-fee331ecdbc4</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5b817966-c1e4-4723-ae4b-667303c102da</cbc:ID>
+                            schemeVersionID="3.2.0">eb361b46-9db7-445b-aa97-a8410b3aefe9</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e31cd4c5-7656-48b9-ad01-8f425b441f36</cbc:ID>
+                                >23d2e128-5091-4b51-9831-ccb3917c16df</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6e01ecfa-ccdf-4629-8296-a095609bc2e4</cbc:ID>
+                                >f6d8cf52-419d-4f81-9d6b-40fbba49f36d</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4360,75 +4367,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4ef049e7-6086-428d-b7f4-e6b6f55833c7</cbc:ID>
+                        schemeVersionID="3.2.0">9ac37fa4-4732-4527-9412-ee3fa2898ac7</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">fe1e6582-ce89-4473-9787-b9e002d9d31d</cbc:ID>
+                            schemeVersionID="3.2.0">4cfcfea4-5eb0-44cd-80c1-34aac9977c41</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1b6793d8-d93c-4f31-9edd-66d978cabb93</cbc:ID>
+                            schemeVersionID="3.2.0">5b8647db-528a-49cc-8f9b-bf286089a68f</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">19275ff4-a40b-4cd6-abb0-16c470028d3b</cbc:ID>
+                            schemeVersionID="3.2.0">95a644b2-387f-4b60-8a34-6943f97ef771</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >7a2ee1b3-bc49-4d69-9c03-15348dde9ff0</cbc:ID>
+                                >250e1126-6673-4605-85d4-bd4ddfe94595</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4448,7 +4455,7 @@
             economic operator?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4458,49 +4465,49 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4e6904db-c48d-467f-90ce-8f3647ace13b</cbc:ID>
+                        schemeVersionID="3.2.0">063b38c4-5e17-49a2-badb-d4525f725719</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1e1a9c38-e73d-4e37-9bac-145cc68d7289</cbc:ID>
+                        schemeVersionID="3.2.0">ca27d9d5-cd03-4b92-9c82-6bc0dc9b3f47</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7696fb3f-9722-43b8-9b91-ad59bb4b8ad2</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a0c92cb1-b62f-426c-94ef-6c1c3360d3f9</cbc:ID>
+                            schemeVersionID="3.2.0">e8153721-9d65-4912-a68b-d636131f11cd</cbc:ID>
                         <cbc:Description>If yes, please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">14d44e2d-f22c-4d6c-bd4a-4c5389498cd2</cbc:ID>
+                            schemeVersionID="3.2.0">1b5c1156-d53d-40a6-86ef-f1c2970ed997</cbc:ID>
                         <cbc:Description>Indicate whether the economic operator has
                             it</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4508,29 +4515,29 @@
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >2a7320e2-ac9d-4fa3-b1b5-6651a5bc6660</cbc:ID>
+                >71420e19-2289-400e-a58c-d3e0c82b878a</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >a53561d5-6614-4dbe-987e-b96f35387f46</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">59305111-c4f1-4c1b-bcbf-203f7a100450</cbc:ID>
+                    schemeVersionID="3.2.0">5077dc72-3e66-45d9-8be0-000688252567</cbc:ID>
                 <cbc:Description>Register name</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4540,11 +4547,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">afcdc1bb-6f3e-4e50-a9fc-6976de96959e</cbc:ID>
+                    schemeVersionID="3.2.0">ad14dc2d-d9b7-4e55-b527-b519ddd6e6d9</cbc:ID>
                 <cbc:Description>URL</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4554,54 +4561,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">561f80dd-a4ef-4850-8cb0-e55a293bd4a4</cbc:ID>
+                        schemeVersionID="3.2.0">d5af1db4-eb93-45f9-b245-56834c2c7aed</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7593b764-0a4d-47d6-89f0-0d7a6e075790</cbc:ID>
+                            schemeVersionID="3.2.0">7a2fb181-d83d-4ef4-b31f-2c07907713a2</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >cb79ad7a-8102-4174-8393-bdf484c7b620</cbc:ID>
+                                >756659ae-5f30-4926-9f9f-0107f6f72425</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e19c63d6-3bbf-4b96-a51b-837754edf902</cbc:ID>
+                                >9ded52ed-4515-4764-83b0-9dbc1e688755</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4611,75 +4618,75 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >6cce6b8e-c53d-4598-8150-ac49aba3b9c7</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8af57bc1-3fc9-4201-be26-5dd2fbbf0962</cbc:ID>
+                        schemeVersionID="3.2.0">83d31491-25bf-40a4-85db-a53accb37155</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >70d5bbcf-0581-4d0f-b5c7-8b604a791972</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">9687850b-2238-4be2-b228-3e1514924617</cbc:ID>
+                            schemeVersionID="3.2.0">07882ee0-f357-4d97-ac22-ca0444735e2f</cbc:ID>
                         <cbc:Description>Registration number</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >3a4a5421-81cc-468e-b69f-b86bf8c7932d</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4a257379-00a6-40a0-af74-4292813f50b0</cbc:ID>
+                            schemeVersionID="3.2.0">43ab3515-4ca3-4479-bac4-1e8506530be6</cbc:ID>
                         <cbc:Description>Reasons why your are not registered</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7db168ce-1ae7-47c0-bc96-f94d3d55a6d5</cbc:ID>
+                            schemeVersionID="3.2.0">ffb387ff-894d-42ec-8528-f058ab42ae97</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c7932d58-463d-4435-a65c-f66f27f7201e</cbc:ID>
+                                >906343cf-01ad-4b5e-955c-ac64fba46325</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4699,7 +4706,7 @@
             follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4709,54 +4716,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">63d1fbb2-f70b-4d34-bfe1-eaab32da6a71</cbc:ID>
+                        schemeVersionID="3.2.0">d57fd5f2-d610-4f5d-996b-beb74e117578</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">337f3622-2caf-4df3-acd6-f721f74cd881</cbc:ID>
+                        schemeVersionID="3.2.0">6c041312-bc3b-4ee4-9210-8b5c2732dfef</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >1e504f9d-7012-4cef-a7ef-59d4f27805b7</cbc:ID>
+                >15ed44e5-7c34-4fb4-acf3-54fe3d252f5b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >5f22470b-df27-4ffd-ba4e-0973a41f97ca</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2bd8eca3-ee44-4ed0-8d44-c728847b0407</cbc:ID>
+                    schemeVersionID="3.2.0">e950261b-64aa-4081-8478-0803f6239251</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4766,26 +4773,26 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">3c051949-0eff-4794-98fd-813565cdceec</cbc:ID>
+                    schemeVersionID="3.2.0">e6160cc1-75c7-4d9b-9d0e-f72fec07784d</cbc:ID>
                 <cbc:Description>Threshold per year</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">CODE_BOOLEAN</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                <cbc:ExpectedCode listID="BooleanGUIControlType" listAgencyID="OP"
+                <cbc:ExpectedCode listID="boolean-gui-control-type" listAgencyID="OP"
                     listVersionID="3.2.0">CHECK_BOX_TRUE</cbc:ExpectedCode>
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4a00575d-c8f0-4854-89cf-da4025c3b1d8</cbc:ID>
+                    schemeVersionID="3.2.0">08b805c6-e140-4e27-80b8-82e560afaa72</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -4796,54 +4803,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">39d550e1-bfbc-4d8a-b789-43097f9d7658</cbc:ID>
+                        schemeVersionID="3.2.0">e0b350c8-440e-42bb-9921-53111dab2151</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2458b132-dcd1-4170-bd15-f70ef750ca90</cbc:ID>
+                            schemeVersionID="3.2.0">aabe983d-4186-448e-b196-aaca7fa5f7b7</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >db6e3f78-7fea-4393-a962-3f757405e47e</cbc:ID>
+                                >d64de756-cfb2-448e-8667-84e917c07604</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >da0bece8-41f1-4be5-92a3-8bed7adc5235</cbc:ID>
+                                >89a9b55c-497e-4afd-9c65-3ebc1d482ab3</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -4853,53 +4860,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >c0cd9c1c-e90a-4ff9-bce3-ac0fe31abf16</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">20f7cd0e-35d9-498b-9364-d8fbf97f55ff</cbc:ID>
+                        schemeVersionID="3.2.0">d33b96d4-9c44-4300-af5c-5bc13ea91053</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5302a421-1658-48f4-8f59-e9a8fcfb85c9</cbc:ID>
+                        schemeVersionID="3.2.0">874096f6-700d-4948-a131-047315dc0da9</cbc:ID>
                     <cbc:Description>Start date; End date</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">eb310ae4-a45f-40c1-9f44-82fb5f786032</cbc:ID>
+                        schemeVersionID="3.2.0">0bdd7380-02d9-488e-b605-f267869f877c</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">879b110b-117a-462a-b707-6649877f5e34</cbc:ID>
+                            schemeVersionID="3.2.0">f7c040ca-7b62-491e-b119-9f78ace8b2fe</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4907,47 +4914,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3f4505e0-0a5a-41f0-b08d-ca313543318d</cbc:ID>
+                        schemeVersionID="3.2.0">2eab1d2d-e309-4b36-a678-6cdb0ff6fca0</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5de07e96-509a-4d8c-ae46-82aca5a86237</cbc:ID>
+                        schemeVersionID="3.2.0">7c48e550-10c7-4d25-a1b6-f8b3116b33a9</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6f7f84fb-90e0-4210-93a0-04ff2264772b</cbc:ID>
+                            schemeVersionID="3.2.0">499e8b81-5a24-4883-a8d0-751fc10b99a2</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -4965,7 +4972,7 @@
             relevant notice, the procurement documents or the ESPD is as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -4975,54 +4982,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1fae5b9d-3f13-4a47-8d8f-c63492a0cd20</cbc:ID>
+                        schemeVersionID="3.2.0">d5d1f1e9-fd40-4678-9c2a-1c17ec809f74</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dbd29d1c-c928-43a5-81e4-20967bc06be1</cbc:ID>
+                        schemeVersionID="3.2.0">df9cbd77-b4a5-4185-8bc8-5ee29cea2837</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >61df4782-e014-4433-b999-dccf8313acaf</cbc:ID>
+                >c305b658-c17a-4018-92c5-a7a42874f968</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >53882893-f4a8-40ae-99dc-cad7b0748790</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">51c86472-68a6-456c-a953-c6aabbf68252</cbc:ID>
+                    schemeVersionID="3.2.0">39e9c1d4-9d13-449a-bfb4-97de36d3aa24</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5032,11 +5039,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9046b076-5fda-460a-b99a-c143a8d2b921</cbc:ID>
+                    schemeVersionID="3.2.0">8b222efe-634e-4c7c-84a2-5b49133a79b8</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5047,54 +5054,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5e163a29-aa47-44be-ac50-8654d7833169</cbc:ID>
+                        schemeVersionID="3.2.0">8d2b1fb3-f36a-4e7a-81e3-ceb2c86a4c83</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">76b30fb8-ca35-4a98-b711-97245f18fbe2</cbc:ID>
+                            schemeVersionID="3.2.0">1b340387-49cc-4f16-9d4b-fe6f7dd9465d</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >eb2ab949-2e22-4200-827c-819019210ea8</cbc:ID>
+                                >4f161124-34ad-43a6-818f-57f3fde06c22</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b29505ed-a5ea-49b2-b58b-a2cec2ab19bf</cbc:ID>
+                                >c82b332c-0ac7-47cd-b172-f6f6289bd836</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5104,53 +5111,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e1886054-ada4-473c-9afc-2fde82c24cf4</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4e7b085b-cc90-42a9-98f1-81b3cfbb7c0a</cbc:ID>
+                        schemeVersionID="3.2.0">e5f18123-b47f-459a-990d-529dbc2ca1e0</cbc:ID>
                     <cbc:Description>Average for the required period</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f2a2c9d5-2c35-4a6b-bdce-d7271ce1530d</cbc:ID>
+                        schemeVersionID="3.2.0">dea6b9d7-1fb2-47a6-97d9-4d92e21bb7d7</cbc:ID>
                     <cbc:Description>Additional information</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5ec1ba2e-a1d0-4476-af86-b4ff61587965</cbc:ID>
+                        schemeVersionID="3.2.0">f662e946-2b66-4bcd-a7ec-18d0be20c310</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">72652dba-b9cb-4075-bd61-d3382a53ac32</cbc:ID>
+                            schemeVersionID="3.2.0">35ba5fd3-352b-4571-874f-06320b44b051</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5158,47 +5165,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ded204ac-fb38-4675-9427-30166486e19f</cbc:ID>
+                        schemeVersionID="3.2.0">bb364819-bfe5-496c-8b35-4d7d80c8a14f</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2cf4f72c-0e84-4dda-b9c8-feb1b87213bd</cbc:ID>
+                        schemeVersionID="3.2.0">41749c91-7144-4495-a106-b4f01c412186</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6a50e20e-4112-4d7d-80c8-02ced1925acf</cbc:ID>
+                            schemeVersionID="3.2.0">9d1f2516-0ad5-4aca-b455-2a664e6dd9b0</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5217,7 +5224,7 @@
             relevant notice or the ESPD is as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -5227,54 +5234,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a697824d-e27c-44b9-a428-f53f35adf41d</cbc:ID>
+                        schemeVersionID="3.2.0">133ae8c3-6faa-436e-a27c-14ded8724f6b</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">42dd929f-8f35-4826-92a9-d39d2e6125b6</cbc:ID>
+                        schemeVersionID="3.2.0">79a1006a-c0e2-4563-b604-039fa60b5fbb</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >00f6b8ef-9e72-457d-a072-74fc8e4f8ce7</cbc:ID>
+                >7d521e36-0528-4d50-b0ff-bb3cd6294052</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >6cff132b-8d15-4f79-ae37-2f9295432381</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">57a800f0-c61d-415e-b84b-496cb11599e2</cbc:ID>
+                    schemeVersionID="3.2.0">1f880cf1-89ff-4cea-9192-d6c1af78b828</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5284,11 +5291,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">543cf35e-1b20-4256-88b2-5c5699c2bfc2</cbc:ID>
+                    schemeVersionID="3.2.0">b3430715-8a9f-4b90-89ba-cae6c995d554</cbc:ID>
                 <cbc:Description>Business domain description</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5299,11 +5306,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">272d0f24-8b40-4037-9f04-2e032ae304f0</cbc:ID>
+                    schemeVersionID="3.2.0">5689fc24-deef-4ee4-9e1e-a99a661751b4</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5314,54 +5321,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">122189e8-1165-4313-b7da-b043f820855b</cbc:ID>
+                        schemeVersionID="3.2.0">dd2d1114-5f81-42ab-b083-03deb8b6b186</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a669c2e0-2143-4535-9780-fd196d600c9a</cbc:ID>
+                            schemeVersionID="3.2.0">1b769c55-5045-490b-9296-3b9a6a12d7f1</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0de347a0-80f2-4cab-af7b-4c237f2a97e4</cbc:ID>
+                                >9528fa90-6b50-4e25-8857-5be1cc548d39</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f6a23d5f-5616-404a-afa6-2d628495a98f</cbc:ID>
+                                >a1ab6f7f-41f2-4ebd-bb07-c3ed61630c1d</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5371,53 +5378,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >c0cd9c1c-e90a-4ff9-bce3-ac0fe31abf16</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">02b20f0f-f3f7-4e01-ba0b-6d3b46f52255</cbc:ID>
+                        schemeVersionID="3.2.0">453ceff4-3f1d-4671-8def-a21d4eaf8723</cbc:ID>
                     <cbc:Description>Start date; End date</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dc058513-cfdd-4091-b244-7dfba6984677</cbc:ID>
+                        schemeVersionID="3.2.0">e2b8836f-c58c-4f60-ab7c-8aa0225bffee</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2851fc73-309e-4311-a4f2-bd9982548a86</cbc:ID>
+                        schemeVersionID="3.2.0">d2d399b3-4299-4fde-8443-b2f5d88e6393</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ff735492-e19a-4e7a-8f6d-7605de306207</cbc:ID>
+                            schemeVersionID="3.2.0">96d90e43-77b4-408d-bdb5-387c73ee7772</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5425,47 +5432,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ea84008c-d433-4f35-b890-cf759a867d7f</cbc:ID>
+                        schemeVersionID="3.2.0">5b202fdb-a84a-4890-b706-82b391e15e67</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d89aa35f-1075-4dcd-a9de-9a8bfe6b28aa</cbc:ID>
+                        schemeVersionID="3.2.0">9a7b15b9-b453-44b2-827c-5068def55854</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e7114963-6494-4a1b-abbc-abd6ea610905</cbc:ID>
+                            schemeVersionID="3.2.0">f109b4ea-9afe-4709-829e-b27ec92550bb</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5484,7 +5491,7 @@
             relevant notice or or the ESPD is as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -5494,54 +5501,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">25392dba-fc3b-4b7c-b1fc-f8562766a819</cbc:ID>
+                        schemeVersionID="3.2.0">bbb9ac08-2bc9-4b07-b454-6d4ca8001ff7</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1803ee38-79c8-4bcf-9175-57e36d2b3597</cbc:ID>
+                        schemeVersionID="3.2.0">c3577644-741f-4de0-bd03-2990bf054633</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >2fef4038-928a-4231-8940-5acf5128266a</cbc:ID>
+                >fa4a543e-5439-4dae-b552-aa83173dcc93</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >19a68e37-d307-4a28-9061-c22cd767be58</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c615c25b-7867-4661-ad89-6fc22aa7c986</cbc:ID>
+                    schemeVersionID="3.2.0">9bf71170-d6a2-4529-96d8-f28747aeb6ef</cbc:ID>
                 <cbc:Description>Number of fiscal years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5551,11 +5558,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">41d58b3d-e5b0-4ad1-a8f9-d41c5c490ad7</cbc:ID>
+                    schemeVersionID="3.2.0">4c778e57-aced-4d8c-ac37-d7b44de2531a</cbc:ID>
                 <cbc:Description>Business domain description</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5566,11 +5573,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4a58c712-4d55-4da1-b1a2-399ae369f74f</cbc:ID>
+                    schemeVersionID="3.2.0">f69e81fe-8d6d-4164-ac1b-cd9c4b803275</cbc:ID>
                 <cbc:Description>Minimum requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5581,54 +5588,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9d90ed39-d7da-4dec-b3e7-d3cbc80cc5e5</cbc:ID>
+                        schemeVersionID="3.2.0">0e340daa-c45d-4815-b739-eceb47354366</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2fa30107-4aab-4cfa-8ab2-be58f7a79e0b</cbc:ID>
+                            schemeVersionID="3.2.0">29fd6f80-0bac-46e7-8bed-0beddd8b0c50</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >22d24a10-f340-4e65-9a83-524dd3f2f88c</cbc:ID>
+                                >335ca321-4558-45c8-8056-31455d311e9f</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8802fac7-29ee-485c-873b-d33d45ad1b5e</cbc:ID>
+                                >152997e4-4816-4f13-95f0-1dbc376fcd31</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5638,53 +5645,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >c0cd9c1c-e90a-4ff9-bce3-ac0fe31abf16</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3886d2a7-8706-4efb-8d79-a1b4c6ca6898</cbc:ID>
+                        schemeVersionID="3.2.0">21d5cffb-f82e-4dcd-9528-fdae4e4bea2d</cbc:ID>
                     <cbc:Description>Start date; End date</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2eabef1e-34b9-4f90-8cc4-dff1f14c8c24</cbc:ID>
+                        schemeVersionID="3.2.0">807796cc-814a-469c-8a87-0b2a59c5824e</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4192dc66-bda9-4826-963a-9157584646c4</cbc:ID>
+                        schemeVersionID="3.2.0">22c79199-4af9-4d00-8c80-61043e783e68</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">9bcb6d75-2a8d-4ca9-a999-77bb67358407</cbc:ID>
+                            schemeVersionID="3.2.0">3a4a1881-64a0-460f-af16-7dcea892ba0d</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5692,47 +5699,47 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >e9aa7763-c167-4352-8060-1a3d7d3e2662</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a131e596-12bf-4402-97c7-020bf5352365</cbc:ID>
+                        schemeVersionID="3.2.0">1b5889c0-0cee-4c8e-bd74-410356f5eda7</cbc:ID>
                     <cbc:Description>In case the information concerning turnover (general or
                         specific) is not available for the entire period required, please state the
                         date on which the economic operator was set up or started
                         trading:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e649bdb7-b204-4099-9fe3-098486838b17</cbc:ID>
+                        schemeVersionID="3.2.0">e2e9d35c-ffb5-4410-8dcd-17ded0bc5458</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">be1db1b4-aa90-44d3-be6d-1030ddac67c3</cbc:ID>
+                            schemeVersionID="3.2.0">7a9e8f1f-a345-4b3a-8a44-4e5d8ea2de29</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5751,33 +5758,33 @@
             for the required ratios are as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >c9f3ecb0-ec5a-4483-8d36-c11d7acc2655</cbc:ID>
+                >a3ae8a6f-56c9-4a3d-9b5e-017dca0f240b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >cc1da737-6c4e-4f4e-821d-c260029058f6</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0f821205-5e4a-454b-afbb-fc119e664ace</cbc:ID>
+                    schemeVersionID="3.2.0">fe79aebd-ae34-46da-8e88-9f0555d8e39d</cbc:ID>
                 <cbc:Description>Select the periods applicable for all ratios</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5791,30 +5798,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >ee486082-93fa-4c17-8920-fdf01b890bd1</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f344f30d-fbc9-4631-9561-c18216394951</cbc:ID>
+                        schemeVersionID="3.2.0">e82e4ffb-871f-4d23-93e6-651c341e20d5</cbc:ID>
                     <cbc:Description>Ratio Type</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">CODE</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                    <cbc:ExpectedCode listID="PleaseSelectTheCorrectOne" listAgencyID="OP"
+                    <cbc:ExpectedCode listID="financial-ratio-type" listAgencyID="OP"
                         listVersionID="3.2.0">Assets to equity ratio</cbc:ExpectedCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e6fa52cc-603d-4434-b555-2e46e2a007e6</cbc:ID>
+                        schemeVersionID="3.2.0">57ef0ced-34ab-4173-873f-1d59b76c7977</cbc:ID>
                     <cbc:Description>Definition</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5825,11 +5832,11 @@
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4de2f1b0-283b-4c1f-87f6-7f1695aecf52</cbc:ID>
+                        schemeVersionID="3.2.0">1c62943b-faad-4ca6-9784-7bf6850f8f6b</cbc:ID>
                     <cbc:Description>Minimum requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -5841,54 +5848,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c5047212-841f-4e4a-a466-a540dead2e7c</cbc:ID>
+                        schemeVersionID="3.2.0">2c86c84f-1709-4bec-96e1-5310a064a576</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d52ec3a8-838e-4b42-bb77-8f1d0a67efd6</cbc:ID>
+                            schemeVersionID="3.2.0">0f6b5e01-b7f3-4a63-8980-e1f2585bff46</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f8b1062d-9f5f-4239-956a-e36905ba721b</cbc:ID>
+                                >989c1108-9f1f-4b4b-a08e-ab7690f9c1ea</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >a4883134-9e4d-4038-b645-f97b1055c65f</cbc:ID>
+                                >a969f7b2-2d2e-481c-977b-bda985d5c9df</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -5898,44 +5905,44 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >78b2e0e6-1bfe-43f5-a061-d9cf4e6e6ecc</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">97e3db4f-b81d-4527-bf2d-a46d70476394</cbc:ID>
+                        schemeVersionID="3.2.0">4169a4e5-7f6d-4c04-a01f-a73d72ae3500</cbc:ID>
                     <cbc:Description>Please provide your ratio</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">936f8df2-3ade-4ab9-8b2f-7c261160e6ac</cbc:ID>
+                        schemeVersionID="3.2.0">4a6ed36c-e713-445d-892c-537af0ad5356</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">893acf99-408c-4a9f-8279-fa00ec9653f7</cbc:ID>
+                            schemeVersionID="3.2.0">84290aef-4656-47b6-aa31-82c98d2d9c92</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -5953,7 +5960,7 @@
             following:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -5963,54 +5970,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0171f745-297f-4ed2-89f7-3737d21f3345</cbc:ID>
+                        schemeVersionID="3.2.0">5baf2ddb-478b-45bc-aaee-f6f9919fd2d1</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3fa9e2ab-5bc0-46e7-bcb6-327cebe19f3b</cbc:ID>
+                        schemeVersionID="3.2.0">55a3ba8f-982b-4dbf-ab0f-b26363ca9513</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >6997af47-3df9-48e8-a851-948caff77541</cbc:ID>
+                >76100cc7-c54d-4c83-a48e-ec3f369e463b</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >83e3dcc4-c9b3-47e5-9fb8-ffd8386679f1</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9c400582-cd49-4f40-b3b4-b2bcfb4e8759</cbc:ID>
+                    schemeVersionID="3.2.0">61547077-2ec4-4010-bd2d-55b91dcc55a4</cbc:ID>
                 <cbc:Description>Type of insurance</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6021,11 +6028,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0bd977fb-7d1e-4020-9f9f-4052950f8657</cbc:ID>
+                    schemeVersionID="3.2.0">0ef48545-0b53-4d76-91ba-b6751cd36d9e</cbc:ID>
                 <cbc:Description>Minimum amount</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6036,54 +6043,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">33af225e-b12e-452c-8472-299eeae90716</cbc:ID>
+                        schemeVersionID="3.2.0">f23d9100-bbd4-4bbe-9675-152fd977ccce</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">342cfbb8-884c-412c-913b-d380fc0aa3ba</cbc:ID>
+                            schemeVersionID="3.2.0">78ce66bd-56e3-43e4-8235-4fd221ee602a</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >d6e5284c-0cc3-4238-a1e4-cbedcf9c2e9e</cbc:ID>
+                                >c503d5de-1e66-48c2-ab5c-debdad39ef1a</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1f68e150-d72a-49c2-84ff-c950708cc969</cbc:ID>
+                                >03b3a0dd-464e-4b30-9a40-7c362bb0bc08</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -6093,63 +6100,63 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >42dc8062-974d-4201-91ba-7f2ea90338fd</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7051e005-cdd2-4de7-902d-aa194175c74b</cbc:ID>
+                        schemeVersionID="3.2.0">d9182c85-2e4b-4e43-9d7e-87d173dcf40c</cbc:ID>
                     <cbc:Description>Amount</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">375ea8df-3091-4b1e-9c90-737166384d97</cbc:ID>
+                        schemeVersionID="3.2.0">e9a89e55-64d2-4745-88aa-fa7a8006f824</cbc:ID>
                     <cbc:Description>As an EO I will commit to obtain the minimum amount
                         required</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a4e38751-cfe5-46b9-8799-2eaf378829ae</cbc:ID>
+                        schemeVersionID="3.2.0">c95c6e4d-f83e-44fb-91e9-28338d076b51</cbc:ID>
                     <cbc:Description>I am exempt</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">11569e7c-c0e9-4b6e-b07c-87cb00f5bbf4</cbc:ID>
+                        schemeVersionID="3.2.0">ea5ff060-1d01-4c11-8855-c88ebbd8d33b</cbc:ID>
                     <cbc:Description>Is this information available electronically?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2fb98ee7-76b6-4052-8cb1-684d01915e29</cbc:ID>
+                            schemeVersionID="3.2.0">e0082599-d105-4d82-abea-cd335eb248c8</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6168,7 +6175,7 @@
             declares that:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6178,89 +6185,89 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">85c6792d-c936-480b-b6f4-89bc5573e03a</cbc:ID>
+                        schemeVersionID="3.2.0">378793ab-23a5-4715-870f-79fc465af05c</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6afab6a1-4d60-4f48-b181-fc6fd2b58eac</cbc:ID>
+                        schemeVersionID="3.2.0">226e3fbd-38f6-4a7e-976f-98e094b118c4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >099b4a86-80d1-49f2-85ac-05f3d777f660</cbc:ID>
+                >c4a43e79-1205-46de-950c-164baeb47306</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >4ddccd16-91e4-4b72-ae0f-78f2f1ab9490</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">8d7715fe-775b-4c60-8652-8149b423a6cf</cbc:ID>
+                    schemeVersionID="3.2.0">e2fdda11-38c4-48e1-aef1-9a8fce61f4e8</cbc:ID>
                 <cbc:Description></cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >26ece6a2-b360-46c1-890d-8338913b8719</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2bff808e-1e68-4b6d-9904-1b7f7ba85ad9</cbc:ID>
+                        schemeVersionID="3.2.0">2f3e0cfb-2de1-4382-93b1-be7b87e290de</cbc:ID>
                     <cbc:Description>Select the type of requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">CODE_BOOLEAN</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
 				authority. Hence the element 'cbc:ValueDataTypeCode' contains the type of value of
 				the requirement issued by the contracting authority -->
-                    <cbc:ExpectedCode listID="BooleanGUIControlType" listAgencyID="OP"
+                    <cbc:ExpectedCode listID="boolean-gui-control-type" listAgencyID="OP"
                         listVersionID="3.2.0">RADIO_BUTTON_TRUE</cbc:ExpectedCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >ca15c15f-110e-4a10-8d6e-5e41cf5f9098</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">3be70221-a5bf-4dd4-858e-b4df7bf46dd7</cbc:ID>
+                            schemeVersionID="3.2.0">56ad4d38-92be-4634-b870-73a52b08d85b</cbc:ID>
                         <cbc:Description>Description of the economic or financial
                             requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6270,11 +6277,11 @@
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">3fba35a8-c6ac-4d38-b856-dbc133c75ee8</cbc:ID>
+                            schemeVersionID="3.2.0">0059a0d4-2e0c-46ba-9d89-73ddadd6456a</cbc:ID>
                         <cbc:Description>Minimum amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6284,11 +6291,11 @@
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ca31c9ee-ef6f-4a66-898c-cbb2675cf438</cbc:ID>
+                            schemeVersionID="3.2.0">ad8214c5-d313-42c2-8eba-7136eb44a0a1</cbc:ID>
                         <cbc:Description>Start date; End date</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6302,16 +6309,16 @@
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >9b3a04ff-e36d-4d4f-b47c-82ad402b9b02</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >39a46f41-f594-443a-801a-3d0b8666ee92</cbc:ID>
+                                >0df24460-da87-4cde-8c64-7fb8433582ad</cbc:ID>
                             <cbc:Description>Amount</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6319,15 +6326,15 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >cc96aa19-a0be-4409-af58-ff3f3812741b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">76d78dcc-f77b-499b-9731-26874cdc95c5</cbc:ID>
+                            schemeVersionID="3.2.0">7fc12631-bbd5-4e64-a832-27615a88e844</cbc:ID>
                         <cbc:Description>Minimum rating</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6337,11 +6344,11 @@
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">49b6aaa4-fc38-4ba4-b919-715ca5ac096a</cbc:ID>
+                            schemeVersionID="3.2.0">3110150f-8b48-4a4d-bb55-f514e815a1f8</cbc:ID>
                         <cbc:Description>Rating scheme</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6352,16 +6359,16 @@
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >5fe93344-ed91-4f97-bcab-b6720a131798</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0f7b141e-868d-41a6-9847-a49877625465</cbc:ID>
+                                >ccfb636d-cd62-4238-99ed-704e6ca04ebd</cbc:ID>
                             <cbc:Description>Rating</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUANTITY</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6369,31 +6376,31 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">33908c67-80af-441f-81cd-f9ae4f88c34f</cbc:ID>
+                            schemeVersionID="3.2.0">62edbc1c-93b9-4f6d-b56e-5c1c7e45a4db</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b66950d2-6a62-41fa-8622-b0dfa48b3096</cbc:ID>
+                                >bcabacdb-5246-4789-9eb7-0d623862bf93</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -6414,7 +6421,7 @@
             years.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6424,54 +6431,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6aa1b11b-a775-4871-aa73-05bf91a0653c</cbc:ID>
+                        schemeVersionID="3.2.0">0deb22ab-9bad-43ee-9c46-1e39298862f9</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">2f16cc88-5c6b-4079-8550-553b9d9740a9</cbc:ID>
+                        schemeVersionID="3.2.0">2d4efee2-4f2c-4747-9ed0-b2a4c7f2286c</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >aeded8e3-f8ba-4779-b4d3-395ad6663574</cbc:ID>
+                >e929689e-7178-427c-8448-1207e574bc50</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >381bea15-9460-49f7-a6d0-15d13059de29</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">818015e0-2527-4668-9590-65d7e088d927</cbc:ID>
+                    schemeVersionID="3.2.0">989702df-f96c-4c5c-ae47-7cff220ba0a5</cbc:ID>
                 <cbc:Description>Minimum number of references</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6482,29 +6489,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e7447159-79d5-49c1-8c92-d033daad46f8</cbc:ID>
+                        schemeVersionID="3.2.0">e997e07b-e6bc-40e2-b26a-93f137938428</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >d663aca5-5f3c-4980-b825-81e1bd7db381</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4a7bff56-a94e-4d66-9874-2b645a45d461</cbc:ID>
+                            schemeVersionID="3.2.0">83beef4a-efd7-4552-a75e-a82c14d9731b</cbc:ID>
                         <cbc:Description>Requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6518,150 +6525,151 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a44e24e9-f878-4651-9ead-e0b1387dae09</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7172b884-d6ff-4e4f-9fb8-b6d5fc1bcfdc</cbc:ID>
+                        schemeVersionID="3.2.0">75c9a2c6-600d-45c3-a88f-0cc46c3904f3</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >c8ec5c30-2c17-4936-abbb-392523d873e5</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">fc1398d0-8576-4b49-b680-6562b2acf947</cbc:ID>
+                            schemeVersionID="3.2.0">4abe33b2-0c46-4878-b9dd-05b6b5e627e6</cbc:ID>
                         <cbc:Description>Reference description</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">b6815579-49e8-4007-8b94-43cc4f471ca4</cbc:ID>
+                            schemeVersionID="3.2.0">ba0699bc-5640-4bc9-8cc9-2ab670338b56</cbc:ID>
                         <cbc:Description>Total amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">bf9b23ac-132f-4791-b3f6-78fdbab2980e</cbc:ID>
+                            schemeVersionID="3.2.0">6e59aba0-63f5-43ae-a36e-0285d1e44563</cbc:ID>
                         <cbc:Description>Activity of the economic operator</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">bb285219-a1a3-45ab-91e4-c2ec88165465</cbc:ID>
+                            schemeVersionID="3.2.0">fc80cd6c-9d2d-4200-8bd2-0c4e436a024d</cbc:ID>
                         <cbc:Description>Specific amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e8f09071-e560-4840-9a4a-74bf27a0641e</cbc:ID>
+                            schemeVersionID="3.2.0">a61ffe2d-326a-4ff6-8edc-9ad11ab88974</cbc:ID>
                         <cbc:Description>Period (Start and End dates)</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d8e826ae-b39f-43ac-bcf1-f727861ac335</cbc:ID>
+                            schemeVersionID="3.2.0">a3689265-e265-44ef-a421-da804a7f06d5</cbc:ID>
                         <cbc:Description>Confidential</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >6afa7569-e4c4-4538-be89-84a82b2a301b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0f86d18e-c337-4c4f-8046-3ddd6feb6021</cbc:ID>
+                                >c4fc9a64-02af-4277-a31a-4ee040a108ba</cbc:ID>
                             <cbc:Description>Recipient name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2b844126-6290-4668-a10a-03787a6db6f8</cbc:ID>
+                                >a91f90e9-8605-459d-abcb-2c832e9e7dfd</cbc:ID>
                             <cbc:Description>Contact person name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >7e0e3b8c-4ef4-464f-af37-19132dbbd12b</cbc:ID>
+                                >721db70e-99df-4512-ad68-36d826ee7539</cbc:ID>
                             <cbc:Description>Contact email</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1ba266af-ff69-49df-bf9b-de483d50f2f4</cbc:ID>
+                                >45992824-bc8d-4efc-b53d-72bddc5f4d57</cbc:ID>
                             <cbc:Description>Contact telephone</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8536f119-0040-4684-a720-c2c761354d49</cbc:ID>
+                                >6836b4a3-f572-41ee-9030-ace0a78be635</cbc:ID>
                             <cbc:Description>Is this information available online?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >c1c2748a-2fa1-45aa-b5bb-b2f6dcdfa7ab</cbc:ID>
+                                    >bbc6aa84-6aee-4ce1-bc75-bac76aa5b49a</cbc:ID>
                                 <cbc:Description>Evidence Supplied</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -6684,7 +6692,7 @@
             more than three years.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6694,54 +6702,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">6142bfca-39fd-48ea-a876-da5120610805</cbc:ID>
+                        schemeVersionID="3.2.0">50b9e5ed-8b7b-4ea3-9160-d26dd50062fb</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">496067d6-f1d1-41ae-9d89-6b3b9a00f55d</cbc:ID>
+                        schemeVersionID="3.2.0">8adb05bd-eac1-414e-b40f-d2a6c58528f4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >508f4ef6-c36e-4411-aa0c-0d5d1d7aef44</cbc:ID>
+                >9567f7a2-d80d-49c3-9922-0ed8a853cd69</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >381bea15-9460-49f7-a6d0-15d13059de29</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">19a0a899-e88d-452a-92ec-ad7912d20af5</cbc:ID>
+                    schemeVersionID="3.2.0">4b1ddbf3-792f-46f0-bb6c-0c86b99c51c8</cbc:ID>
                 <cbc:Description>Minimum number of references</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6752,29 +6760,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">91e8a419-5231-4747-a635-14fc304d0d76</cbc:ID>
+                        schemeVersionID="3.2.0">931b822a-148c-4878-b22c-949f02cf4e99</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >d663aca5-5f3c-4980-b825-81e1bd7db381</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">f3706229-01dd-443e-896c-1e82f160ac71</cbc:ID>
+                            schemeVersionID="3.2.0">88a52438-5efc-494f-af02-2895c1ac530c</cbc:ID>
                         <cbc:Description>Requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -6788,150 +6796,151 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a44e24e9-f878-4651-9ead-e0b1387dae09</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f0f34980-ecd5-4c16-80b3-2fbab8a2e754</cbc:ID>
+                        schemeVersionID="3.2.0">a9be2931-f0a5-493d-b735-5456b32bd9d1</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >c8ec5c30-2c17-4936-abbb-392523d873e5</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7a73268c-bf50-4532-b06c-43b1ef8ec675</cbc:ID>
+                            schemeVersionID="3.2.0">ddb59a3a-c1bf-4f82-b9de-351ed4a7020a</cbc:ID>
                         <cbc:Description>Reference description</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">38bfece6-3546-463d-813e-bce2eac6d4e3</cbc:ID>
+                            schemeVersionID="3.2.0">9c517751-2162-4660-b003-1fd297e6bdfb</cbc:ID>
                         <cbc:Description>Total amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">dc87ff24-ee5e-4c61-97ed-3313ded3c9bc</cbc:ID>
+                            schemeVersionID="3.2.0">3c39c779-8292-4c37-96d4-14c9411d5aee</cbc:ID>
                         <cbc:Description>Activity of the economic operator</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c16a2d4e-5e8e-4d3e-a121-b9c291236921</cbc:ID>
+                            schemeVersionID="3.2.0">fa522465-5665-468c-97ff-2a65dd71f737</cbc:ID>
                         <cbc:Description>Specific amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">cdbad0d6-029e-48e9-8a89-59fe853f0dfe</cbc:ID>
+                            schemeVersionID="3.2.0">94ce236b-0902-46ce-b626-3133273239eb</cbc:ID>
                         <cbc:Description>Period (Start and End dates)</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d7fc28b1-8651-49df-b18f-e7b1985c7599</cbc:ID>
+                            schemeVersionID="3.2.0">04edf6f9-0cb5-4bf0-8203-9b74ff939faf</cbc:ID>
                         <cbc:Description>Confidential</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >6afa7569-e4c4-4538-be89-84a82b2a301b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >976bb531-b059-41d5-a577-226e03316ffc</cbc:ID>
+                                >2346b112-88e4-4a2d-9fcc-a18f01957d00</cbc:ID>
                             <cbc:Description>Recipient name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b3d2ad2f-ce7f-4d1f-b892-519008f33015</cbc:ID>
+                                >44ac8db3-babe-4f56-8252-f271d80bc170</cbc:ID>
                             <cbc:Description>Contact person name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >245bf718-3797-44fa-b404-0b67e5189297</cbc:ID>
+                                >353b327f-f12c-44d3-b2ff-023852542981</cbc:ID>
                             <cbc:Description>Contact email</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3f772196-21ef-4364-be35-b25faeca7b92</cbc:ID>
+                                >e8d1eb66-d68d-4f16-960a-a2b83a32194e</cbc:ID>
                             <cbc:Description>Contact telephone</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >591e5dc3-3984-4076-b58c-1e5c76949a03</cbc:ID>
+                                >2b1177b5-69fa-4da4-9784-1635d5e5b3f2</cbc:ID>
                             <cbc:Description>Is this information available online?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >de156b0e-1e69-40af-b77f-532ea34a7edd</cbc:ID>
+                                    >7ad2e145-0e38-4bb0-a439-f1961201022c</cbc:ID>
                                 <cbc:Description>Evidence Supplied</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -6954,7 +6963,7 @@
             more than three years.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -6964,54 +6973,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c43a9b9d-1149-4800-82f4-924397d07dc4</cbc:ID>
+                        schemeVersionID="3.2.0">d9ed9832-f1d5-436c-92c8-17aa3b6436e1</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f30e8bf1-237a-451e-a86f-32996af02070</cbc:ID>
+                        schemeVersionID="3.2.0">ea3f1fbb-6f74-4bc5-b444-2dd379c9a947</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >f3a3d48b-ae72-48bc-bccf-99a066ff10cb</cbc:ID>
+                >69ef1e4f-5aba-49a2-9d9e-5c4bbec78649</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >381bea15-9460-49f7-a6d0-15d13059de29</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5fed1364-79e5-45a2-a5af-fed497ebf4bb</cbc:ID>
+                    schemeVersionID="3.2.0">962b4eb6-df4e-4091-b1f5-e02b2e7b6a03</cbc:ID>
                 <cbc:Description>Minimum number of references</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7022,29 +7031,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >53c9aad8-dc80-48f8-85d9-755c2aab8e95</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e79c6248-5405-4b60-932d-cedc4887cda6</cbc:ID>
+                        schemeVersionID="3.2.0">ecf45bbf-bd1d-462c-8aef-4c8e901b5609</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >d663aca5-5f3c-4980-b825-81e1bd7db381</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">b930ca5f-8030-4461-8d38-c464b77a6ad0</cbc:ID>
+                            schemeVersionID="3.2.0">dababd7b-040a-426d-9b2e-c7f492d3c7ce</cbc:ID>
                         <cbc:Description>Requirement</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7058,150 +7067,151 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a44e24e9-f878-4651-9ead-e0b1387dae09</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7974939b-1c4c-4699-9a66-f868c3a619a6</cbc:ID>
+                        schemeVersionID="3.2.0">8cd38f28-b86d-434a-829b-13f1649b8445</cbc:ID>
                     <cbc:Description></cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >c8ec5c30-2c17-4936-abbb-392523d873e5</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">74ad03ac-fee6-41ba-a0f6-ae55b08e97e7</cbc:ID>
+                            schemeVersionID="3.2.0">be2965fd-8d20-4555-ba4b-b4bc90d5d3b7</cbc:ID>
                         <cbc:Description>Reference description</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">3732318e-1fcc-4b6e-b42c-8b79a0492544</cbc:ID>
+                            schemeVersionID="3.2.0">7bbbe01b-2cfc-4350-b2a1-b1aa65f6cec7</cbc:ID>
                         <cbc:Description>Total amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1247738e-627b-4785-9471-eb905ad094c4</cbc:ID>
+                            schemeVersionID="3.2.0">34ac4171-1845-46bf-93e0-9a0b06c2f5b0</cbc:ID>
                         <cbc:Description>Activity of the economic operator</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4f059269-5f8a-4083-88fd-ea14bb417d2b</cbc:ID>
+                            schemeVersionID="3.2.0">907b115e-5a3c-41a2-b960-859788985950</cbc:ID>
                         <cbc:Description>Specific amount</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1672173c-10bb-4a52-a98b-fb6cc5aee342</cbc:ID>
+                            schemeVersionID="3.2.0">8d387ab4-10a1-408c-9d26-638175e9acbf</cbc:ID>
                         <cbc:Description>Period (Start and End dates)</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">PERIOD</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">91077dee-73a5-4652-90e6-0603a5998bc6</cbc:ID>
+                            schemeVersionID="3.2.0">1250aa9f-7582-4ea3-8631-bb88962e3606</cbc:ID>
                         <cbc:Description>Confidential</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >6afa7569-e4c4-4538-be89-84a82b2a301b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f496a60c-b46c-4523-9330-ecf43a0c60f2</cbc:ID>
+                                >e9b45e82-c1ca-49ed-873c-9a677c1cf303</cbc:ID>
                             <cbc:Description>Recipient name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >4bb4f5d6-c4ea-448a-a5e9-c07f813b31e7</cbc:ID>
+                                >946038ab-7ce9-4fa7-9a6c-d43ab7f0b342</cbc:ID>
                             <cbc:Description>Contact person name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e9cf8a8d-7843-486a-a461-470674988bf3</cbc:ID>
+                                >4ba5deba-d1a6-4d2c-89b7-c047d6d13f4b</cbc:ID>
                             <cbc:Description>Contact email</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >121aff15-c7c8-432b-8d3d-be83e1e9dfce</cbc:ID>
+                                >fdc7addd-2eb9-4262-adca-003e8f97a8ec</cbc:ID>
                             <cbc:Description>Contact telephone</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b52d9cf2-a0c5-483d-9ee1-42919a14686c</cbc:ID>
+                                >2329f324-68c4-493b-a691-9a07f375ca67</cbc:ID>
                             <cbc:Description>Is this information available online?</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >b8766dbe-5aa7-42ed-85dc-c219ede689bd</cbc:ID>
+                                    >567e1547-c9c2-461a-a12a-13c3c2f07c85</cbc:ID>
                                 <cbc:Description>Evidence Supplied</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -7225,7 +7235,7 @@
             in.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -7235,69 +7245,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">60760025-463c-4a9b-8a5d-006dae99ea02</cbc:ID>
+                        schemeVersionID="3.2.0">66dc80ac-0d50-4ed7-8942-34c557f0e50f</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">24de607a-cf21-4c41-930a-b8eff9605052</cbc:ID>
+                        schemeVersionID="3.2.0">ba4b9c3f-6338-4ab3-ab39-bd6d4b0f76da</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >d02e6d98-f48f-416f-812c-e08310e131d5</cbc:ID>
+                >f7d76e45-c718-40c1-bfed-4e7eb99ba1d5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d5136dc8-369f-4d88-bdaa-df1bf0adb236</cbc:ID>
+                    schemeVersionID="3.2.0">83aae36f-7a4d-4417-863e-8ca3765e572f</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d77afca3-671f-4052-b14c-787de8ac557b</cbc:ID>
+                        schemeVersionID="3.2.0">68508492-28e4-4039-a716-124f22a121e7</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7308,57 +7318,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2daa4027-5910-4afb-bfee-b7a591049445</cbc:ID>
+                            schemeVersionID="3.2.0">2134c970-e573-42fa-adad-18661234a39c</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2ce5da6e-7883-49b0-8967-5f13205386de</cbc:ID>
+                                >4dfaf80d-85ae-4b75-bc6f-942ab4b07689</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >ea4aaebd-f340-4bbd-b853-97a56a72dbea</cbc:ID>
+                                    >6ec117b8-0362-4410-9a36-079c5afff5b7</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >f3155ad6-2157-4998-8d8a-5de38de77e78</cbc:ID>
+                                    >c92ffe6c-6a80-4ebe-ba24-96ce004ed6ae</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -7368,113 +7379,114 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >609cc954-64be-4b4f-800a-f17589deb936</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ced36cb8-45dc-4806-9b55-eef142fa7d7c</cbc:ID>
+                            schemeVersionID="3.2.0">6149be7d-7354-4631-aef8-3a63d792269b</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >52ffcf91-3598-438f-8c3d-faf97da02602</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c258987e-6c7a-4772-864e-b0f0c086e4e1</cbc:ID>
+                                >56679c55-80f6-4ec4-86c6-fd7813e52d41</cbc:ID>
                             <cbc:Description>First name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8c7b5dff-7c89-412e-bbb2-60f0152719ae</cbc:ID>
+                                >11a278f4-5f24-432c-8cd6-b7ec3f408979</cbc:ID>
                             <cbc:Description>Last name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1657b58a-6a4f-4cc8-9f4e-5ea3ebf1830f</cbc:ID>
+                                >ad2e9e05-ec9a-4cfb-8e03-4e152f02107b</cbc:ID>
                             <cbc:Description>Profession</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >c14b9403-576c-4da7-bde5-3869fba271e1</cbc:ID>
+                                >1640462c-8f35-4a8c-bcc2-18a0b1760e65</cbc:ID>
                             <cbc:Description>Experience</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8c9f0bc8-68d6-4697-baf2-65f9593eeaa4</cbc:ID>
+                                >392a47b5-e65f-476e-ad5f-c2314a85ea1b</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3b3efcc5-9d03-47e2-bc39-3e24e50fb730</cbc:ID>
+                                >68816a0b-bc0b-4937-a8d2-b500f97ca353</cbc:ID>
                             <cbc:Description>How long with EO</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >a737ec68-f01c-41d2-b3ee-688b0493ebd6</cbc:ID>
+                                    >47bc0673-5faa-47b6-b323-8b4d1b82c6a5</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >a8cac3b9-6d84-4ed4-a015-ff468923283a</cbc:ID>
+                                        >901bf57f-6a56-477f-aeb0-6f87a211bde3</cbc:ID>
                                     <cbc:Description>Evidence supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7485,83 +7497,84 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >45a67f48-d146-4faf-8239-dd6977dffe29</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">554a60f8-9208-4d6f-be69-851edc7ed94f</cbc:ID>
+                            schemeVersionID="3.2.0">1b37c46b-9808-460b-9f8c-31d6d55aea1a</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >70e28455-d0e1-47e7-9caa-ead3b7df7644</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1513aad2-bbdc-4e01-9d99-b718e4584d80</cbc:ID>
+                                >e87edaaf-e033-4f01-a8aa-3d824ae13e29</cbc:ID>
                             <cbc:Description>Name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6735b3ae-a48f-4a57-acff-f8073c8a3342</cbc:ID>
+                                >c9448b99-9bb4-42c0-a402-b7b8ac87a12f</cbc:ID>
                             <cbc:Description>Experience area</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >5a71a4ee-f48a-4820-81ed-cdb9af91a04c</cbc:ID>
+                                >23e89998-856f-447b-a2c6-7e12256c638d</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >8275d09a-7a84-413e-a568-df021a089a5e</cbc:ID>
+                                    >0a95d951-542b-48f9-b218-571d89c2cd2a</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >6febcc89-6a92-455a-bd39-4d62f79cdf4e</cbc:ID>
+                                        >2cae9642-22cb-47df-94d8-9d32b9b74474</cbc:ID>
                                     <cbc:Description>Evidence Supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7585,7 +7598,7 @@
             work:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -7595,69 +7608,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a910ef94-db22-47f0-8a9d-38fc8eb3b470</cbc:ID>
+                        schemeVersionID="3.2.0">1fa34dea-b66d-455f-b532-9366b2c9bd17</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9e154fc4-a13a-42d5-83d0-abef13415ada</cbc:ID>
+                        schemeVersionID="3.2.0">ac048acb-1a85-491e-8356-30a97469a491</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ea4af9a3-82e3-4678-b6e7-f1cdbb4a9749</cbc:ID>
+                >59069401-b1ad-4ada-95c9-5610ae29a5fa</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">b307e828-9f88-4b11-b236-513b8cacf3b8</cbc:ID>
+                    schemeVersionID="3.2.0">ee7a0cce-3b8d-4554-9f2b-d936857ec7b4</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">158d863c-0b50-4f4e-bfbf-9a2f074ad3ef</cbc:ID>
+                        schemeVersionID="3.2.0">fa3a50a8-07a0-4985-a31f-e385f1fc60a7</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -7668,57 +7681,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ddd3989c-32ce-448d-9825-d1a34b421b39</cbc:ID>
+                            schemeVersionID="3.2.0">09e97215-b4e0-4022-9a3a-42cafcf6f4ff</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >420ff719-7aa1-499c-9d17-66a3b3e61224</cbc:ID>
+                                >9ddd66b3-f19f-4d65-8399-37708de62745</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >c1766bd7-55ca-4089-8e36-a945efef2435</cbc:ID>
+                                    >dcac8046-a774-4c1e-898c-eed5cb66735a</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >1211cdd4-1ba1-4291-88b5-3a45f636b36d</cbc:ID>
+                                    >acd3a890-924f-4c37-ab3c-6e01d477c5d6</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -7728,113 +7742,114 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >609cc954-64be-4b4f-800a-f17589deb936</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">52cb3892-a852-453f-8028-d8a492ce0ff1</cbc:ID>
+                            schemeVersionID="3.2.0">a20d6c95-250d-40ec-8693-da76d0d067a0</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >52ffcf91-3598-438f-8c3d-faf97da02602</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >8ee3912d-9063-4dd5-bc93-8dc74825a426</cbc:ID>
+                                >23becb50-bd44-430b-8bfc-f835b2c411f1</cbc:ID>
                             <cbc:Description>First name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >2c79de34-5889-40ef-943e-a7f97dbf5a0f</cbc:ID>
+                                >432a7cca-233b-4478-8e7a-f086bf1affe1</cbc:ID>
                             <cbc:Description>Last name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >24fe55ef-00fe-4c96-a79a-1f31665029ad</cbc:ID>
+                                >bfb31970-5077-4de2-90b3-9aa6a00e2780</cbc:ID>
                             <cbc:Description>Profession</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >687fdcbb-4aea-49c9-a0e1-3425ce146e6c</cbc:ID>
+                                >1e705ca0-1c15-4197-b09c-7f459ffee594</cbc:ID>
                             <cbc:Description>Experience</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6137a661-b8ee-48f0-aff5-01e763fec631</cbc:ID>
+                                >d1f79c50-a376-454a-8dbd-085b1315c898</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >d5a8566e-c494-4a72-a45c-7e66d84bc906</cbc:ID>
+                                >e1400145-e447-49da-bfdb-78c7a895fa55</cbc:ID>
                             <cbc:Description>How long with EO</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >287b4ad2-271c-4698-96ba-05a7b0a92b09</cbc:ID>
+                                    >00e5d091-62df-4f6e-8d92-cf3c7da9fccf</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >d3c9141b-67dc-4c2c-a8ca-08adcf56f0b9</cbc:ID>
+                                        >eed2b33d-7966-4cc9-9624-bddff851a3e3</cbc:ID>
                                     <cbc:Description>Evidence supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7845,83 +7860,84 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >45a67f48-d146-4faf-8239-dd6977dffe29</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">74b4474a-756c-407d-a88a-8f5b9fa0fff4</cbc:ID>
+                            schemeVersionID="3.2.0">2b8eb75b-50e8-41c7-ab5a-0e7fa464a516</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >70e28455-d0e1-47e7-9caa-ead3b7df7644</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >60ad28b7-babe-45fd-bbfb-5badd8350855</cbc:ID>
+                                >aec4c37e-e2b7-466a-8094-8a2564a57000</cbc:ID>
                             <cbc:Description>Name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b692e5b3-3264-43a7-be42-fdb557d5ee2f</cbc:ID>
+                                >79872ca5-74fd-4e72-8226-7ce07a4299b0</cbc:ID>
                             <cbc:Description>Experience area</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >00ac472f-b3eb-4759-8dcc-e143bc085307</cbc:ID>
+                                >ceb1e981-9d00-4bde-ba9e-5ff09e75a0b7</cbc:ID>
                             <cbc:Description>Other information</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >d40b3d77-efed-42b3-99a5-91e74f467709</cbc:ID>
+                                    >0e49098f-13a2-490d-aead-eba0c24d1ffa</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >0744f4a0-3df4-4718-af8d-508af3f5c3fc</cbc:ID>
+                                        >b994c4f4-67ba-4424-872f-f62839b22a91</cbc:ID>
                                     <cbc:Description>Evidence Supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -7943,7 +7959,7 @@
             quality and its study and research facilities are as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -7953,69 +7969,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9c46b4d7-e162-4915-b2cf-12bc8ae28eda</cbc:ID>
+                        schemeVersionID="3.2.0">4f58b796-b800-4070-8b65-cab0f3aeacd6</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b740677c-4745-4a7b-bb0f-9e891e4c629c</cbc:ID>
+                        schemeVersionID="3.2.0">14cddf8b-3157-4723-ba74-1ca3654020ec</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >0df5ad2a-d539-4b3b-80ee-a68d7fe75b98</cbc:ID>
+                >c1e37b7a-ceeb-4f1d-ad5c-cd1914952a95</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">01691be6-9687-4919-8d99-b6909a1439ce</cbc:ID>
+                    schemeVersionID="3.2.0">6cffdc54-5f39-4112-8004-df4c7e487f76</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a73f09ca-9b89-4c21-97f4-90afc8cde0c5</cbc:ID>
+                        schemeVersionID="3.2.0">1a222a9e-5a0b-4c85-b300-27915281d6f6</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8026,57 +8042,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">0a64dd4c-12f2-4fef-929f-b0e663e067b0</cbc:ID>
+                            schemeVersionID="3.2.0">beded044-9c38-4f46-b9b5-9cf26dad4af7</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >dd827b22-b32b-4323-ba97-a80467e6839f</cbc:ID>
+                                >4dbd7377-5c91-4d06-bf24-dffafb8b8e95</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >5346b4ad-fb1c-49b8-8563-e0fb58066add</cbc:ID>
+                                    >a5eec535-d82b-4db7-bb25-5ce649656c80</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >181e4c49-3107-40ea-af25-116672520b3e</cbc:ID>
+                                    >5876bb1a-72bd-45c1-a2ac-6a0702684541</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8086,46 +8103,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">ac4dc2c9-b9cf-411a-bd98-ed2644ef253b</cbc:ID>
+                            schemeVersionID="3.2.0">68d199d2-c438-4f7b-a4f4-9af4ecdf6efe</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">0e106145-6dce-45ea-86e0-b44276e686b5</cbc:ID>
+                            schemeVersionID="3.2.0">2e5ed202-19d8-4fde-9183-a749c10910d2</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >fed82967-62a9-4ffc-b6c3-2572159c3416</cbc:ID>
+                                >a8e1c32b-6fdf-4550-a2b8-5dcba022a5f5</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8144,7 +8161,7 @@
             follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8154,69 +8171,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">14b27f05-74c2-41d9-ba28-1dfa9e406dd8</cbc:ID>
+                        schemeVersionID="3.2.0">26b73ecc-ae90-4822-b0c4-7ee639af119d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">53a6cfb2-92a5-4123-83f2-b3d0a9e2d136</cbc:ID>
+                        schemeVersionID="3.2.0">273b8dd7-2511-4f41-8fc2-9a250d0d76db</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >1b93f547-69be-474f-b5d8-5f2ae36aae58</cbc:ID>
+                >dd6c74bf-ff14-4215-9842-a580c5dabca8</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">65d1220e-a22e-4be3-ab5c-c4ac42d52d33</cbc:ID>
+                    schemeVersionID="3.2.0">ed8955c3-0f9c-4add-8cfc-d4819fe0351b</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1ea6dc96-67b4-4307-83dc-109184c1ae58</cbc:ID>
+                        schemeVersionID="3.2.0">ad7b611a-c39d-4a6c-bd62-811b5996b9c1</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8227,57 +8244,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">12e6dac1-d258-48a9-b3f3-39b4719ad5c1</cbc:ID>
+                            schemeVersionID="3.2.0">279978d7-7d25-4db4-a4ce-99eb0aa81e76</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1f6802e2-ccc9-48fa-b73b-31810dcecd00</cbc:ID>
+                                >516f0129-2914-4883-811a-195b83d54672</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >fd707f98-8f6e-4563-b93c-d7f009821e8b</cbc:ID>
+                                    >df505f14-271e-473a-8c89-59e3b2d55080</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >212be2e0-f378-4ad4-928c-64d1986e052b</cbc:ID>
+                                    >6280ddf1-cd40-4999-940c-5b33a8acef43</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8287,46 +8305,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a6b42ccf-f765-49a5-8926-a21feaf0367b</cbc:ID>
+                            schemeVersionID="3.2.0">c67323a5-820a-4560-9c47-6887c95fa130</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5622ba91-732b-4bbc-8557-9b66f8001631</cbc:ID>
+                            schemeVersionID="3.2.0">1208ff49-3938-4c9c-b011-8b5d01befbb6</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >9d016972-b9ea-4d31-8003-4d407de444a5</cbc:ID>
+                                >e7c7858a-bb30-4e48-8d4f-20824c5bf6b4</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8345,7 +8363,7 @@
             systems when performing the contract:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8355,69 +8373,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ed3cc98d-5a11-4ec3-9b41-656a503798e8</cbc:ID>
+                        schemeVersionID="3.2.0">ab0a2369-1df1-4c44-92f9-4f50cd9c2d26</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">307a3e60-5fed-4a76-9898-2df14fc492bb</cbc:ID>
+                        schemeVersionID="3.2.0">b1b53604-462e-4bba-8bc6-2f45137a8eb4</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >91e770c9-2303-47aa-8a32-493615b8a6eb</cbc:ID>
+                >8bb964e2-6249-4f47-8645-844d8d0dc66e</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4e60a341-5c84-4446-a1ae-8e6b349d8830</cbc:ID>
+                    schemeVersionID="3.2.0">95056ec0-ca65-4a80-bd56-6d0b6ed1883d</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a8dd0bb7-c78c-4c48-8668-c736e139b9fe</cbc:ID>
+                        schemeVersionID="3.2.0">793c7c4c-1feb-48ed-b4f6-5fbe4d51a28b</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8428,57 +8446,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">42e3416b-6711-4778-bf04-3f032c7eb01e</cbc:ID>
+                            schemeVersionID="3.2.0">e8c90e53-4e7e-4caf-a54d-57027bb02353</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >47abedbb-d6b0-4edd-aaf1-67e84ddb1fa9</cbc:ID>
+                                >df4295fd-e8c0-4a63-8a88-591df73564fc</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >5aa136cf-ef72-4f42-84c7-9094f15f37d6</cbc:ID>
+                                    >2a2dfaab-0cee-4907-96fb-c731adda3f8b</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >f938b4cb-0bbf-47a2-9eed-800a167ab11b</cbc:ID>
+                                    >5ab31c5a-6252-4316-9516-4b495c3d76f3</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8488,46 +8507,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2da759b1-4fd7-41a3-ae2a-478e3ac72c54</cbc:ID>
+                            schemeVersionID="3.2.0">8f164a9c-ee72-4f10-a4d2-7f665bcbcd26</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">52968c1c-76cf-48d8-aaac-693e1545bf77</cbc:ID>
+                            schemeVersionID="3.2.0">b42dde6e-8936-4434-80bf-03d09d765fc4</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >62fb21be-7c5c-47f3-89c5-48208b2c97db</cbc:ID>
+                                >61fefbb1-6c43-44c7-abce-09dcdeb681ea</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8546,7 +8565,7 @@
             management measures when performing the contract:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8556,69 +8575,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b669ec8f-ef91-4ba2-8226-cec56e96ffbc</cbc:ID>
+                        schemeVersionID="3.2.0">2428d883-46dc-4087-905c-361ce5035ea3</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ba6c3a45-ff23-481f-8e90-fd06dc877678</cbc:ID>
+                        schemeVersionID="3.2.0">8800d53c-28c4-42ef-b553-22f9bc65e564</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >1dfd525c-069e-459c-bb83-74f22287ac74</cbc:ID>
+                >da31539e-8714-4699-af4e-5ff9b815ebba</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a6e806ee-55ac-4724-83d4-85dca1a56675</cbc:ID>
+                    schemeVersionID="3.2.0">69ff41a1-5f59-4686-a876-a9c5dbe65af6</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">df928b71-d4ee-452e-aace-fe275995b1b4</cbc:ID>
+                        schemeVersionID="3.2.0">7355b8f9-e8f5-41fe-93ba-44a86ee33f50</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8629,57 +8648,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">75a031ed-bcb5-4239-b990-5c7eb21c720c</cbc:ID>
+                            schemeVersionID="3.2.0">0f808ba7-f909-4a87-a9ac-593bb3ebf73f</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3762dccc-679f-4550-b1c4-8457e9d1a087</cbc:ID>
+                                >5b4927bb-6213-47b8-94ad-9553dcbe52f3</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >43d6eac3-a1bf-4b16-9013-498fb68beed0</cbc:ID>
+                                    >17b7a55d-2c48-49f8-82c7-1e1f5f36bd39</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >5d41e019-0a67-4a46-947f-9c61476dd32e</cbc:ID>
+                                    >fc2f4f98-3d62-4a37-b29d-be4b36c553d7</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8689,46 +8709,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">859b450e-8660-4e0f-9a8f-29d629d35d41</cbc:ID>
+                            schemeVersionID="3.2.0">eb4cc93c-716d-4895-94c4-e8f5b683c286</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c789869b-ce0f-4516-b03f-5f4017220d32</cbc:ID>
+                            schemeVersionID="3.2.0">efef85f0-7333-45dd-b31f-5b8b5d8357dd</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >97d201a3-fce7-4189-9923-d59d39bd51fc</cbc:ID>
+                                >22ee2a33-58c0-4a77-808b-84ba6234f131</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8747,7 +8767,7 @@
             for performing the contract:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8757,69 +8777,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dcd2d13e-be64-4a7e-93dc-5891c5082104</cbc:ID>
+                        schemeVersionID="3.2.0">cc13e8df-e3ea-4f7b-87f4-bd997de2c2b0</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">57b9522f-7410-4baa-b2be-f64f5675e89c</cbc:ID>
+                        schemeVersionID="3.2.0">77c26c89-726c-4a95-a06d-d6691a3d2fa8</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >8fcb9f4e-d691-44bc-a4cf-b940dd78cf1c</cbc:ID>
+                >48e05d0d-ec55-4032-8c51-7d6ebaa64147</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >1e73d705-9dc1-43f1-9b5c-2d0deac7bc5f</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e83f157f-9c63-4b63-a80a-800298bf83b9</cbc:ID>
+                    schemeVersionID="3.2.0">7198efe3-36bc-48cb-96d2-6175b68dc148</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f156d97a-9700-4ad9-8d21-e3ac57102278</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7ab33356-9b58-45fd-adaf-b51f7d390272</cbc:ID>
+                        schemeVersionID="3.2.0">8e709fd0-1d6a-4f57-aa30-13ff99f57a57</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -8830,57 +8850,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">a0e3ee18-daf0-4885-a7af-ae7615f79451</cbc:ID>
+                            schemeVersionID="3.2.0">430cded1-c7f2-4737-b105-a25800dee6e8</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3f3e726b-761a-4207-b2e0-a2f330d82c24</cbc:ID>
+                                >c9c335c0-ea34-4c8e-bb52-bfd81381d1af</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >06cd018b-2368-4382-8da0-3becbfed9bf1</cbc:ID>
+                                    >936865ae-4081-4beb-9760-c6263aef37f2</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >28895213-9dd0-4fcf-b19d-77df250ed9d8</cbc:ID>
+                                    >7ed672bf-221a-43d8-8059-217d5d590b67</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -8890,46 +8911,46 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >488ca189-bcdb-4bf4-80c7-3ad507fd89fb</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">20497b2e-489c-48df-83bf-5439046087c2</cbc:ID>
+                            schemeVersionID="3.2.0">b515f5db-0f9d-4fae-9769-568c8ab4a37c</cbc:ID>
                         <cbc:Description>Please describe them</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">c40f1ffe-f301-4ecd-894d-16976a5d5231</cbc:ID>
+                            schemeVersionID="3.2.0">2f1f67f1-6692-4ad0-895c-34ec008126fb</cbc:ID>
                         <cbc:Description>Is this information available
                             electronically?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >b9593fd7-7874-46ef-96f7-54fffb3903a5</cbc:ID>
+                                >7ec30838-de48-458e-b5b2-9116c418b432</cbc:ID>
                             <cbc:Description>Evidence Supplied</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                     </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -8950,7 +8971,7 @@
             staff.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -8960,69 +8981,69 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8d33a0c6-19c9-4844-8f31-df7abdc35441</cbc:ID>
+                        schemeVersionID="3.2.0">100b4111-75cd-4486-be11-445a0623c6b9</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f8339606-df4d-4625-b750-2f5f0e9dd84a</cbc:ID>
+                        schemeVersionID="3.2.0">cec4c375-cb7a-4fd8-8262-ad2ab2417b92</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >c0c4a5eb-c7a8-4a5c-bdaa-3e95250d0a12</cbc:ID>
+                >544bb185-56e6-48e8-bc4d-0fd4a1886d17</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d2cadc29-07e0-46b2-a74a-a0dc4bd2e5c2</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">e75fcab6-6a6c-4b61-ada2-9268fd06eb58</cbc:ID>
+                    schemeVersionID="3.2.0">101785a8-23ff-4523-8c70-8e3b3cd05f6b</cbc:ID>
                 <cbc:Description>[Additional information; e.g. no evidences
                     online]</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >CAPTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">CAPTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >1be6421a-0360-449e-ae7c-ce7fad73c2c2</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c01c8b90-b9b0-4db4-97e6-c65b16f78bc8</cbc:ID>
+                        schemeVersionID="3.2.0">26d92b25-4e96-41a3-8fc6-ec33341aab99</cbc:ID>
                     <cbc:Description>Requirement</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9033,57 +9054,58 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">6344bb80-ea5b-441c-8f32-8a0b2c691a06</cbc:ID>
+                            schemeVersionID="3.2.0">7b4f0d0c-6089-4ce9-b447-ff1aa996fe02</cbc:ID>
                         <cbc:Description>Does the EO fulfil the criteria by
                             itself?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1ae2f1bd-226d-418c-b0ec-3a405ccf3343</cbc:ID>
+                                >a5c6e655-c39e-413a-9128-62676ca5d4e7</cbc:ID>
                             <cbc:Description>In the case of no – Relied upon or
                                 not</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ONTRUE</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >a69915f4-f7e5-41ca-a574-1cdde7c50997</cbc:ID>
+                                    >059cca81-6f2d-4490-9524-68f48f92fa13</cbc:ID>
                                 <cbc:Description>Name of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >69e7165f-d27e-4d17-b669-6b942e413ca2</cbc:ID>
+                                    >97c4ee14-2346-4dd8-a026-093d71ef0057</cbc:ID>
                                 <cbc:Description>ID of the entity</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0"
                                     >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
@@ -9093,146 +9115,147 @@
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >5df40500-a9b7-4c15-8325-a9762224a3c9</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e312d823-8d92-40fc-bce6-add03c8e8432</cbc:ID>
+                            schemeVersionID="3.2.0">d9021c05-9a57-4caf-88bb-a75d75b93836</cbc:ID>
                         <cbc:Description></cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >5476ec64-de1e-45d2-aaf1-a40a463ab7a9</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e24dd44a-8307-4a7f-8b02-4552653d74f3</cbc:ID>
+                                >64a7565f-e279-46cf-95bb-4ccc9e132429</cbc:ID>
                             <cbc:Description>First name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >7a56f36b-7c54-4e5e-93f9-d81bbff19c04</cbc:ID>
+                                >cd829d3f-6c6d-43cd-a19e-3960b0f3503c</cbc:ID>
                             <cbc:Description>Last name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0b0dd280-ed4a-41e9-9595-073b19955203</cbc:ID>
+                                >5fe8ba13-d8d8-4eac-be00-e0ae676a5d4b</cbc:ID>
                             <cbc:Description>Please describe the educational or professional
                                 qualification</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >e6e3807e-acfb-4cc4-be91-4bcffadf0fc0</cbc:ID>
+                                >f78f1196-bce6-4007-b1c1-c9a3f8c06e14</cbc:ID>
                             <cbc:Description>If possible please indicate the ESCO identifier for
                                 this qualification</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >385ef971-65d7-4bcf-8fb9-7e9fbab9b082</cbc:ID>
+                                >0f0d6047-7341-4a17-be53-6623a868accb</cbc:ID>
                             <cbc:Description>If possible please describe the ESCO
                                 qualification</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >f0eca5df-e233-4bee-86c5-bbec95b575c9</cbc:ID>
+                                >913159c1-8934-440b-b1be-23acb4695f6c</cbc:ID>
                             <cbc:Description>Qualification name</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >fc8c4fab-b3f8-41c5-bb69-dbc29db84b1d</cbc:ID>
+                                >4f6f66e9-f946-4fb4-b057-1293a62ff049</cbc:ID>
                             <cbc:Description>Qualification number</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUAL_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >319f63a8-fe44-4b58-bfec-720a4f0351d0</cbc:ID>
+                                >48e6800b-c1fd-4cbf-a517-31b9e2752f21</cbc:ID>
                             <cbc:Description>Qualification issuing date</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DATE</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >5f0433ad-443f-42e8-bbfe-742469491e74</cbc:ID>
+                                >7e025f70-6c05-4faa-a1b2-659c30907dde</cbc:ID>
                             <cbc:Description>Qualification issuing body</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:SubsidiaryTenderingCriterionPropertyGroup>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                                 >9026e403-3eb6-4705-a9e9-e21a1efc867d</cbc:ID>
-                            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
-                                listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
+                            <cbc:PropertyGroupTypeCode listID="property-group-type"
+                                listAgencyID="OP" listVersionID="3.2.0"
+                                >ON*</cbc:PropertyGroupTypeCode>
                             <cac:TenderingCriterionProperty>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                     schemeVersionID="3.2.0"
-                                    >3e794cbf-721a-4a7d-9810-830d12bec768</cbc:ID>
+                                    >61adfb11-72be-4445-a391-1b0ff2851447</cbc:ID>
                                 <cbc:Description>Is this information available
                                     online?</cbc:Description>
-                                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                     listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                             </cac:TenderingCriterionProperty>
                             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP"
                                     schemeVersionID="3.2.0"
                                     >0a166f0a-0c5f-42b0-81e9-0fc9fa598a48</cbc:ID>
-                                <cbc:PropertyGroupTypeCode listID="PropertyGroupType"
+                                <cbc:PropertyGroupTypeCode listID="property-group-type"
                                     listAgencyID="OP" listVersionID="3.2.0"
                                     >ONTRUE</cbc:PropertyGroupTypeCode>
                                 <cac:TenderingCriterionProperty>
                                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                         schemeVersionID="3.2.0"
-                                        >2c005838-2db0-4b4a-baeb-6241ed90a026</cbc:ID>
+                                        >4753307a-e45b-4153-83ad-87ef4528684a</cbc:ID>
                                     <cbc:Description>Evidence Supplied</cbc:Description>
-                                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                                    <cbc:ValueDataTypeCode listID="ResponseDataType"
+                                    <cbc:ValueDataTypeCode listID="response-data-type"
                                         listAgencyID="OP" listVersionID="3.2.0"
                                         >EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                                 </cac:TenderingCriterionProperty>
@@ -9260,7 +9283,7 @@
             established.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9270,54 +9293,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">fbe0f80c-690d-4f2e-98d7-dc6d68e86403</cbc:ID>
+                        schemeVersionID="3.2.0">4cb0055f-a95e-4ee0-b3af-2b25aedf8da0</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">aaf3f14c-05e9-43fa-8f86-1229cee87d4e</cbc:ID>
+                        schemeVersionID="3.2.0">6e03f00d-a27c-4e28-b259-fcdc0ae827e8</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >b53ce4f0-7013-45a0-89d1-8b203141725d</cbc:ID>
+                >74d3aec2-dd8f-4a4d-be83-893f5d8707d5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >10822ddd-9ba6-42d5-9339-de0845aeafc9</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c2ff332e-a776-451c-8188-64bfea9d81fd</cbc:ID>
+                    schemeVersionID="3.2.0">cf69808a-1980-48b5-be8c-7190a30db848</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9330,54 +9353,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ab4b8da-53ae-4394-b11b-f1ce99e94730</cbc:ID>
+                        schemeVersionID="3.2.0">ed96bf2c-3ba0-4ec1-8f6b-9e1183bf8647</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">fe56763c-90e8-4b2e-9e08-0d28bbb7b64f</cbc:ID>
+                            schemeVersionID="3.2.0">a8319984-b435-486d-a438-9641aa178fb2</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1ffff3bd-2c7a-4b3c-9774-5df68526f16c</cbc:ID>
+                                >31317dbb-e3aa-4b9e-adeb-0abf06e65963</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >98134bde-2b50-4d4e-8024-e99ef09678d3</cbc:ID>
+                                >943b35d5-c623-4d37-ad17-81e84d678679</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -9387,44 +9410,44 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a3410620-8ed3-47f9-ab90-b5b1aeeff6a5</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">177d03cb-d584-4e25-8014-3b7ea6a13307</cbc:ID>
+                        schemeVersionID="3.2.0">dba02ed2-0c21-439f-bc50-54ecc538bea4</cbc:ID>
                     <cbc:Description>Do you allow checks?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d60c2d36-6d8b-4390-90e9-ef3fe47e6c9f</cbc:ID>
+                        schemeVersionID="3.2.0">c7addd31-da76-469e-a044-fb932b364f8d</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">710bddae-405f-4283-b0f1-2e562c919393</cbc:ID>
+                            schemeVersionID="3.2.0">87db6831-c7ba-4e29-a74f-f45a453ac4b4</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -9442,7 +9465,7 @@
             were as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9452,54 +9475,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">83ef2c86-fdee-42cd-be5b-8148e94ba18e</cbc:ID>
+                        schemeVersionID="3.2.0">bb02a423-be43-496a-9561-7f21663522be</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">350fb260-737a-4808-8352-0720d6bd0a89</cbc:ID>
+                        schemeVersionID="3.2.0">f5789164-605c-4ca9-bf2a-7d044e20bef1</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >668e98f1-54da-4ebe-87b9-d2974181393b</cbc:ID>
+                >7b1f02d1-5d3d-42f6-89bb-a9b6e4f9d7ed</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7f7949a8-dbe6-496c-a9f6-6f05b8648bad</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4ae33590-07bb-42c2-9ca9-e10dbcfe6b5a</cbc:ID>
+                    schemeVersionID="3.2.0">c83d8904-969d-4f71-b9c1-c5a8dce2377b</cbc:ID>
                 <cbc:Description>Minimum number of years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9509,11 +9532,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">839322e4-9fa5-446a-8d7e-d44f2b1d857c</cbc:ID>
+                    schemeVersionID="3.2.0">d7980263-9969-4be0-a1c2-0683206bb2d1</cbc:ID>
                 <cbc:Description>Additional information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9524,54 +9547,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d82cee39-bb2f-4329-85b9-a31510149274</cbc:ID>
+                        schemeVersionID="3.2.0">7818b73e-d333-4144-9005-4ef772c246b9</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5ee75638-2902-41c8-ad56-f01385fd0e1e</cbc:ID>
+                            schemeVersionID="3.2.0">42bfb841-7199-413d-b1da-0dfd6e50bf4f</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >bcc5d810-f296-4df4-9bea-e01177b050b8</cbc:ID>
+                                >9afbf6f7-79d4-45fd-a02a-f32d695b1b6b</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >373bd59c-d0b0-4acf-860d-4bb1782d7774</cbc:ID>
+                                >e674f7e0-ecaf-4bf5-a727-0949c7daa1fc</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -9581,53 +9604,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >96defecc-7d32-4957-82e9-aad5f3c5b736</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e7d6f4b-e50f-45d0-b499-8632efb98f61</cbc:ID>
+                        schemeVersionID="3.2.0">106c44ec-701f-4339-b37e-8b6fc4498c09</cbc:ID>
                     <cbc:Description>Year</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">9df90193-41d0-4a26-bc34-18d536a6c48f</cbc:ID>
+                        schemeVersionID="3.2.0">7dc48e11-a13e-404c-9cd2-3714f49c72cb</cbc:ID>
                     <cbc:Description>Number</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">73190003-37a4-4dc9-9965-a584b1769a58</cbc:ID>
+                        schemeVersionID="3.2.0">3fb8d468-85b8-401b-8260-927147763c45</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">145a9020-3303-4418-bd64-cfc03553f57d</cbc:ID>
+                            schemeVersionID="3.2.0">f95479c5-712c-4f94-a535-3c094069053b</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -9645,7 +9668,7 @@
             were as follows:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9655,54 +9678,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1da7bd1c-f974-4fc3-b0f9-e6760e01bd08</cbc:ID>
+                        schemeVersionID="3.2.0">37fe6eb2-4908-4b7f-8129-71e50b2208da</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">72bedd76-4ab9-41d8-a327-6474f287fb5e</cbc:ID>
+                        schemeVersionID="3.2.0">54dc36fb-d135-4676-a19f-eda5bb2f724f</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ffa4f7b1-4a94-42c9-a19b-429be07f119d</cbc:ID>
+                >7060b04f-c573-4de5-b275-3c312e17cf45</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >6ad0b7e3-9946-4e62-be00-d6c1ee70d785</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d386500d-dd39-4eb3-b366-57196d291035</cbc:ID>
+                    schemeVersionID="3.2.0">f8b6a13d-470b-43be-bf2f-4add93788609</cbc:ID>
                 <cbc:Description>Minimum number of years</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9712,11 +9735,11 @@
             </cac:TenderingCriterionProperty>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">1d2fdea1-81df-45b2-90d4-968fbb67cb6a</cbc:ID>
+                    schemeVersionID="3.2.0">018582b7-2b45-4acd-b4d0-be114dcebd4c</cbc:ID>
                 <cbc:Description>Additional information</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -9727,54 +9750,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d50ed7bc-20d2-4a0e-84fd-6976ede4ec41</cbc:ID>
+                        schemeVersionID="3.2.0">1917561a-e8d6-4f80-801a-973891b143c8</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">d028cedc-8584-4428-bdc7-441409b05d0c</cbc:ID>
+                            schemeVersionID="3.2.0">acca3680-b2ec-47e0-a402-a4c95c06cac6</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >cb92956c-ca31-4eca-87a0-9848cf4c26a0</cbc:ID>
+                                >2e1e7211-c0e2-459e-aeba-5a33b3f9b52c</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >bee72d50-e210-4d1b-ad63-391a877ae26e</cbc:ID>
+                                >032a4895-6ff4-41d7-a65d-db26c7c3dba5</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -9784,53 +9807,53 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >96defecc-7d32-4957-82e9-aad5f3c5b736</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">50a2de1f-1441-4572-8d1e-36fb8b041989</cbc:ID>
+                        schemeVersionID="3.2.0">9cb71905-5af0-4cea-b1ff-bb751d102f1c</cbc:ID>
                     <cbc:Description>Year</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b1977039-27fa-415d-9fb2-30ba811667fb</cbc:ID>
+                        schemeVersionID="3.2.0">8ba62f36-e6c3-4296-be7f-9a247f339d58</cbc:ID>
                     <cbc:Description>Number</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_YEAR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">dc84b69c-3ca9-4741-b72d-e779935628b0</cbc:ID>
+                        schemeVersionID="3.2.0">5d70f836-3f9b-457f-9eba-4c8eeeb1f852</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">b06a2778-bce8-4eaa-af21-53247a73042e</cbc:ID>
+                            schemeVersionID="3.2.0">4b527425-1c77-45d6-9863-5297422c0188</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -9851,7 +9874,7 @@
             subcontractors, see Part II, Section C above.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -9861,91 +9884,91 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">08f749b5-5781-407e-b4c0-7ac2903230c1</cbc:ID>
+                        schemeVersionID="3.2.0">dcfb5657-87e5-4164-bed4-73413e0b28f4</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a809fd4c-3170-4307-9f9b-e5ecb90b2eaa</cbc:ID>
+                        schemeVersionID="3.2.0">19396697-a40e-4a21-b678-d19661856ab1</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >57a7cc0f-d3f6-4270-ad02-99dc7906a78a</cbc:ID>
+                >a03a44a2-4a82-4931-8132-f113a788fcd5</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2d8dc8c6-941f-4e4d-978d-5713bc78aed3</cbc:ID>
+                    schemeVersionID="3.2.0">6807fdc4-77c0-4d93-8eb0-1831c43b8e83</cbc:ID>
                 <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">08e53319-3b26-405a-9e48-e91ed101f069</cbc:ID>
+                        schemeVersionID="3.2.0">64f1c9e9-1049-4cc9-9780-c1a557951af1</cbc:ID>
                     <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">dbcd4a32-0688-403a-ba91-1440f046d52d</cbc:ID>
+                            schemeVersionID="3.2.0">d3a9e267-3105-46e1-b959-08b376927dde</cbc:ID>
                         <cbc:Description>Name of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">5f79e744-e75d-4184-b75d-27b25a904cd7</cbc:ID>
+                            schemeVersionID="3.2.0">8bbda05a-b3ef-4669-95c3-1a2d2b27cf9b</cbc:ID>
                         <cbc:Description>ID of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0"
                             >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
@@ -9955,44 +9978,44 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >575f7550-8a2d-4bad-b9d8-be07ab570076</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">57325f91-9fd7-460b-840f-d90ab840b868</cbc:ID>
+                    schemeVersionID="3.2.0">e7accf56-b96f-4dea-b4cd-283564048582</cbc:ID>
                 <cbc:Description>Please specify</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5702afb7-cedc-48db-9325-a5c9ac349fea</cbc:ID>
+                    schemeVersionID="3.2.0">646fd0b3-b30a-4c5f-bcde-5a7f5e82703b</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a66c93ee-4b47-4dce-bf18-2a8c8b6d3da7</cbc:ID>
+                        schemeVersionID="3.2.0">75b1fda5-d237-4f34-ba4d-b60aee2c822b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10011,7 +10034,7 @@
             to be accompanied by certifications of authenticity.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10021,91 +10044,91 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e9d06679-4214-4d9a-9e91-4cd83957f17c</cbc:ID>
+                        schemeVersionID="3.2.0">7ccd3412-1835-4fe0-94ea-deb24ad664d1</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">ec8e3bde-19c3-461e-aa8f-3b601cdff44c</cbc:ID>
+                        schemeVersionID="3.2.0">64e86ba5-3bdb-4057-9a03-0fc06ec1120e</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >fc43bd90-4620-4554-bc5d-ef5cbc2fc379</cbc:ID>
+                >8ea25328-dfdd-4f52-a7d4-c46684bb7002</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">1ec17851-76bf-4437-8d4f-fe11d585d127</cbc:ID>
+                    schemeVersionID="3.2.0">09f2c0e7-28fc-4e7c-a54f-2825646f6c5d</cbc:ID>
                 <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0662597f-a9f7-4f3d-ab56-6c6523ff9ec8</cbc:ID>
+                        schemeVersionID="3.2.0">6847dd49-bc90-4a1b-9653-639f1d705821</cbc:ID>
                     <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">78d258fa-46ab-4727-af93-f6fe88b993d8</cbc:ID>
+                            schemeVersionID="3.2.0">76e15bf0-49f2-4ae8-80f7-8912d5179a44</cbc:ID>
                         <cbc:Description>Name of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">e7ad1759-3ed8-4513-9eb9-a5eb9cc233b9</cbc:ID>
+                            schemeVersionID="3.2.0">ba46a279-9c42-4cc0-812c-025c7f0ad2af</cbc:ID>
                         <cbc:Description>ID of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0"
                             >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
@@ -10115,44 +10138,44 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >cb73544d-e8bb-4cc6-819b-b8e04f1e240e</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">7f901dea-30d9-4595-bdf5-a19b741d251a</cbc:ID>
+                    schemeVersionID="3.2.0">885eaeb5-016e-4531-967c-f43728948304</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c50aea51-67b8-482c-9ae2-b59e78976e82</cbc:ID>
+                    schemeVersionID="3.2.0">e30b0d27-bbe0-484d-8a98-cd4c24748262</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4b7e3bcf-8609-4545-994c-f8c18b1e966c</cbc:ID>
+                        schemeVersionID="3.2.0">b7ceec15-a590-4c23-9a85-5dbc33b8bb53</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10171,7 +10194,7 @@
             certifications of authenticity where applicable.</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10181,91 +10204,91 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1fd2cd3b-05a5-4e45-854c-18ba0c1480da</cbc:ID>
+                        schemeVersionID="3.2.0">91fc39fa-8183-4550-ac10-cd63ea54e068</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8962eacd-a927-43b7-8938-167a8558bb51</cbc:ID>
+                        schemeVersionID="3.2.0">28c3b196-7633-466a-a443-40f4d7603d47</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >b4e5aeb7-59d3-4226-84f4-7bd113110e3c</cbc:ID>
+                >7c59c3b1-7f96-44ba-9799-0086d86d1490</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">97ddd9f3-cd6f-40ee-bc90-439961571e8f</cbc:ID>
+                    schemeVersionID="3.2.0">870b6b8f-79c9-4ac7-bb55-780a58be1884</cbc:ID>
                 <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a56b9052-2e1c-4d76-ab02-5bd9049a93d8</cbc:ID>
+                        schemeVersionID="3.2.0">4643441b-a76a-4cbe-bf85-5509e6b501ce</cbc:ID>
                     <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">244428a3-29f9-4ddc-b230-ade55b584b8f</cbc:ID>
+                            schemeVersionID="3.2.0">c7fd228c-a3fd-4cd4-8576-d98c04693394</cbc:ID>
                         <cbc:Description>Name of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">8a2d9ff2-7ff8-4b14-9cf5-f78774ab13c0</cbc:ID>
+                            schemeVersionID="3.2.0">18b2afb8-d7c2-4e81-9921-40c5260daa39</cbc:ID>
                         <cbc:Description>ID of the entity</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0"
                             >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
@@ -10275,44 +10298,44 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >cb73544d-e8bb-4cc6-819b-b8e04f1e240e</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">94ff50b9-8a8d-4f1d-978b-437bec7d88f2</cbc:ID>
+                    schemeVersionID="3.2.0">8574f792-a494-4578-b33f-a1eb26638a06</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
         </cac:TenderingCriterionPropertyGroup>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">c80267c1-6e58-452d-b3d9-694232fb20b3</cbc:ID>
+                    schemeVersionID="3.2.0">b2702c1b-fa19-4711-b547-98d63c0e1f47</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b9df4351-cf8f-4758-b966-44546a87f04f</cbc:ID>
+                        schemeVersionID="3.2.0">ee2553ab-b7f9-4cc3-8dee-919be5efa3cf</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10332,7 +10355,7 @@
             notice or ?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10342,54 +10365,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">b00dca2d-aa42-4643-89dc-a65291ccc394</cbc:ID>
+                        schemeVersionID="3.2.0">79a89696-d570-41c9-a0fe-bcf818f3de0d</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">eb95686a-6fa3-48e3-9d41-f4e99abbabd1</cbc:ID>
+                        schemeVersionID="3.2.0">5411e769-fe3e-4b02-8fe3-5d994685008a</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >ae37f845-ae9e-4cad-9065-5fa1d1f052a6</cbc:ID>
+                >812f75d4-39b4-4eaf-b953-9ad947b32ecc</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >612d99eb-ea3b-4275-ac06-0db05e039c8c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">7bcf6673-afce-4e58-afac-6e2ba293c1b0</cbc:ID>
+                    schemeVersionID="3.2.0">369c3132-7fd5-42d3-8bb2-886c5ba9d59b</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -10400,54 +10423,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">26387307-bb64-41d9-a98c-c09f95d01f7c</cbc:ID>
+                        schemeVersionID="3.2.0">e9e340e4-ae75-4a50-93fc-ae23114217df</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">4d94e15a-39a5-497b-aeda-97afcdd37205</cbc:ID>
+                            schemeVersionID="3.2.0">59e78cf5-8a1b-45d2-a2d0-56edf0e23004</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >0149e588-dfe1-42e0-b8c7-ce56d5b197d0</cbc:ID>
+                                >cc03f6ba-fa9c-4d29-b441-d7ee8bdfc7a0</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >1f28d638-98ca-4611-a92b-7597ddd74840</cbc:ID>
+                                >839521c2-7f97-496e-bbf1-1b810b5812c0</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -10457,30 +10480,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4887c3d7-05fc-4e3e-b066-f338910f0c4c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">3775b0b8-bf7c-4ccb-bb88-d9b6e3159614</cbc:ID>
+                        schemeVersionID="3.2.0">2bbdc521-f830-462a-ab7a-c6394298d24a</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >83f2f79e-0455-4918-89ff-d7829e8bf758</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">edaffe7f-83cc-443b-89b6-2e348ac1177f</cbc:ID>
+                            schemeVersionID="3.2.0">b8d27c00-f130-40ee-89d0-30d7818bfd6a</cbc:ID>
                         <cbc:Description>If not, please explain why and state which other means of
                             proof can be provided:</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10488,29 +10511,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5ea5abcf-5253-4150-9576-372e20669b7e</cbc:ID>
+                        schemeVersionID="3.2.0">8a49f999-f430-4b0b-8c3c-ecf3389cd6f0</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">09b6a09b-351b-4036-9ae1-e7d46f463c19</cbc:ID>
+                            schemeVersionID="3.2.0">e4627f18-08cd-4f86-877a-d0b207de3435</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10530,7 +10553,7 @@
             persons?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10540,54 +10563,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7cd056f0-54e5-4fdc-bcb9-75d91ad86dc2</cbc:ID>
+                        schemeVersionID="3.2.0">7def3972-4174-46c9-8b61-8911be28c950</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">bd324580-d05f-4481-8d3b-70e151e2d65c</cbc:ID>
+                        schemeVersionID="3.2.0">eb5ed47a-c4b5-4cee-9f83-e3c69d3209b3</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >2d3545dc-cf65-4b2c-9400-b31625c69e5d</cbc:ID>
+                >b4217f03-0d23-473e-b4bc-a4b0d8767a14</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >612d99eb-ea3b-4275-ac06-0db05e039c8c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">0cdcecc2-5dc1-42f9-8d5b-108d57d5092f</cbc:ID>
+                    schemeVersionID="3.2.0">25e0c670-f6ae-4f05-b7e4-46061761d19b</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -10598,54 +10621,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7fcccfc9-5b05-4581-8933-0eedbdfca388</cbc:ID>
+                        schemeVersionID="3.2.0">2ccfe198-c170-4702-a02e-9f338149268e</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">28e954ea-ec72-4902-8ae3-1e4b83f972e2</cbc:ID>
+                            schemeVersionID="3.2.0">a8887830-35d7-4255-b9dd-3fb6ef423474</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >3fd20674-fbbc-459b-a48c-a140b0855b85</cbc:ID>
+                                >ebd9f1eb-c72c-4c9e-9e84-a65d5cc1d396</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >9390d721-b490-495f-8975-ec2440d74946</cbc:ID>
+                                >f88f75ed-19d1-4281-b460-c5206a3e256b</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -10655,30 +10678,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4887c3d7-05fc-4e3e-b066-f338910f0c4c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">018a1043-69fd-468b-b1ed-d310de679c50</cbc:ID>
+                        schemeVersionID="3.2.0">0e46a27c-71d3-45a5-936e-ae6e2a8a146c</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >83f2f79e-0455-4918-89ff-d7829e8bf758</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">2bd50b04-16d8-4bc3-99ae-db41d04d968b</cbc:ID>
+                            schemeVersionID="3.2.0">3a34a944-4790-403d-9304-ca0012b20ec3</cbc:ID>
                         <cbc:Description>If not, please explain why and state which other means of
                             proof can be provided:</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10686,29 +10709,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a7d86f76-72fa-479d-9caa-5d7bff7beb8a</cbc:ID>
+                        schemeVersionID="3.2.0">dc7930dd-63a6-46cf-a803-80c5ef7e405d</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">1ea38df2-dbbb-4c3f-ace8-4c785814fb66</cbc:ID>
+                            schemeVersionID="3.2.0">ce1e0365-7f64-4448-a1ac-930a951ce7dd</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10728,7 +10751,7 @@
             environmental management systems or standards?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:SubTenderingCriterion>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
@@ -10738,54 +10761,54 @@
             <cac:TenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >8c39b505-8abe-44fa-a3e0-f2d78b9d8224</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ca9e274-d777-4b16-8084-e434641ab839</cbc:ID>
+                        schemeVersionID="3.2.0">4405774c-e392-4a8e-8847-6c8c8b346cb8</cbc:ID>
                     <cbc:Description>[Additional information; e.g. no evidences
                         online]</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">CAPTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">NONE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7e94e885-4de6-4102-b4d8-3aacd2f6d688</cbc:ID>
+                        schemeVersionID="3.2.0">5e2b22bc-c112-45b7-b858-3d86d1532519</cbc:ID>
                     <cbc:Description>Your Answer</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:TenderingCriterionPropertyGroup>
         </cac:SubTenderingCriterion>
         <cac:Legislation>
             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX" schemeVersionID="3.2.0"
-                >47c8af91-cbc7-4b48-9500-6aba4e48d289</cbc:ID>
+                >66b91bb2-b3d3-4a48-ad21-7a44b73ea901</cbc:ID>
             <cbc:Title>[Legislation title]</cbc:Title>
             <cbc:Description>[Legislation description]</cbc:Description>
             <cbc:JurisdictionLevel>EU</cbc:JurisdictionLevel>
             <cbc:Article>[Article, e.g. Article 2.I.a]</cbc:Article>
             <cbc:URI>http://eur-lex.europa.eu/</cbc:URI>
             <cac:Language>
-                <cbc:LocaleCode listID="language" listAgencyName="ISO" listVersionID="20201216-0"
-                    >ENG</cbc:LocaleCode>
+                <cbc:LocaleCode listID="http://publications.europa.eu/resource/authority/language"
+                    listAgencyName="ISO" listVersionID="20201216-0">ENG</cbc:LocaleCode>
             </cac:Language>
         </cac:Legislation>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >612d99eb-ea3b-4275-ac06-0db05e039c8c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">f67b4953-0d40-44c7-86f7-0ac088104d03</cbc:ID>
+                    schemeVersionID="3.2.0">d01de757-805b-420b-8054-077e2af5bf22</cbc:ID>
                 <cbc:Description>Requirement</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >REQUIREMENT</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">REQUIREMENT</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 <!-- No answer is expected
 				here from the economic operator, as this is a REQUIREMENT issued by the contracting
@@ -10796,54 +10819,54 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >0e50931d-4d39-4f1d-9fdc-b2cf16c0807a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ab8809a-c171-4415-add8-29f901f7a618</cbc:ID>
+                        schemeVersionID="3.2.0">d2691b1a-188d-46b9-9c77-1f8abe23ad1d</cbc:ID>
                     <cbc:Description>Does the EO fulfil the criteria by itself?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >fe557ed0-2387-478f-a9be-d0f3457c088e</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">573f7333-74c5-41e4-b2be-969a086148b7</cbc:ID>
+                            schemeVersionID="3.2.0">ef87d818-ce94-4e0d-888a-14933990d884</cbc:ID>
                         <cbc:Description>In the case of no – Relied upon or not</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                     <cac:SubsidiaryTenderingCriterionPropertyGroup>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                             >e296a1cc-83d3-48ac-b4e4-7e7d0ae0af25</cbc:ID>
-                        <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                        <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                             listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >6d02ffe0-b258-4261-8d40-7ecc4756fadb</cbc:ID>
+                                >fc80055b-f16d-4df5-bbf3-ccd0f8da9256</cbc:ID>
                             <cbc:Description>Name of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
                         <cac:TenderingCriterionProperty>
                             <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
                                 schemeVersionID="3.2.0"
-                                >4eb3baa0-5a12-4c20-9838-98cfb5fed5bd</cbc:ID>
+                                >5c0fae04-d865-44ff-92e7-8b54ec787e07</cbc:ID>
                             <cbc:Description>ID of the entity</cbc:Description>
-                            <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                            <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                                 listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                            <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                            <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                                 listVersionID="3.2.0"
                                 >ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                         </cac:TenderingCriterionProperty>
@@ -10853,30 +10876,30 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >4887c3d7-05fc-4e3e-b066-f338910f0c4c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5757b23d-2338-4501-a66c-0f4566c7f4ac</cbc:ID>
+                        schemeVersionID="3.2.0">ef2cff6f-a7a4-4535-ae72-07dcbf7cb00b</cbc:ID>
                     <cbc:Description>Your answer?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >83f2f79e-0455-4918-89ff-d7829e8bf758</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">33031d84-1618-409c-bbbb-efd5192b9bad</cbc:ID>
+                            schemeVersionID="3.2.0">d0bf766c-c6c1-4908-8225-ca4143703b66</cbc:ID>
                         <cbc:Description>If not, please explain why and state which other means of
                             proof can be provided:</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10884,29 +10907,29 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f6266b0e-57d3-4a7d-bdda-c9c00f4ac873</cbc:ID>
+                        schemeVersionID="3.2.0">da48c330-2c79-44bb-bd44-0fef2d9edfec</cbc:ID>
                     <cbc:Description>Is this information available online?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">14229f75-d88f-42aa-8af6-02bc8d9cfa5a</cbc:ID>
+                            schemeVersionID="3.2.0">0125c3f3-4c88-4de4-ac47-356d39f87251</cbc:ID>
                         <cbc:Description>Evidence Supplied</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10925,46 +10948,46 @@
             contract in the context of sheltered employment programmes?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >6febbe4a-e715-427c-a2b1-19cfabadaef0</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">9ed07bbd-a1fc-4ded-8e31-985466fa1598</cbc:ID>
+                    schemeVersionID="3.2.0">2ee86253-d7db-4f97-8037-0e8bb73e2004</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >a5e33369-e2b5-45f7-9969-ddb1c3ae17c8</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">57a84af0-cfb3-4041-bf21-85f7f40b7577</cbc:ID>
+                        schemeVersionID="3.2.0">ffa8d4a4-364f-4c6b-93ac-6b53b8c5e71e</cbc:ID>
                     <cbc:Description>What is the corresponding percentage of disabled or
                         disadvantaged workers?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">PERCENTAGE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">83984206-5656-499c-9c3a-1b0cbc44ae26</cbc:ID>
+                        schemeVersionID="3.2.0">4eb908ba-87ba-4697-b2ae-e48a62f304a3</cbc:ID>
                     <cbc:Description>If required, please provide details on whether the employees
                         concerned belong to a specific category of disabled or disadvantaged
                         workers?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -10972,29 +10995,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">52308e50-47aa-4527-8189-36fada14f264</cbc:ID>
+                    schemeVersionID="3.2.0">f0738b16-7c94-4810-b964-de2664c85aaf</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">8ac53510-c8ed-4cbd-886c-9453c4a3c2c4</cbc:ID>
+                        schemeVersionID="3.2.0">a79c90a9-0c26-45c8-bc3a-c9e1aeb8720b</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11012,72 +11035,72 @@
             national (pre)qualification system)?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >ecb5127b-9018-4fb8-8327-a6a7a2c73195</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4fd61ee6-0105-4d79-9289-3bb006b59045</cbc:ID>
+                    schemeVersionID="3.2.0">0320cd97-541b-444b-9879-584f6b625635</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >dc4acf0c-c761-40d0-b031-4ee1f224be5c</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">574bb4da-d992-4eae-9f53-8dfc13c115bf</cbc:ID>
+                        schemeVersionID="3.2.0">25bc373c-9734-4743-a328-c1dd909a4a77</cbc:ID>
                     <cbc:Description>Please provide the name of the list or certificate and the
                         relevant registration or certification number, if
                         applicable</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0256b5c2-75e6-4bbb-a1cb-71a2f40e37e2</cbc:ID>
+                        schemeVersionID="3.2.0">8f1dd729-2402-4ca2-9530-dff339a4ebb6</cbc:ID>
                     <cbc:Description>If the certificate of registration or certification is
                         available electronically, please state where</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">URL</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">99dce1b8-d98a-4bf8-af21-42abe8e1e642</cbc:ID>
+                        schemeVersionID="3.2.0">f669234b-fedc-4f1e-9b5e-1c7dff9f6f24</cbc:ID>
                     <cbc:Description>Please state the references on which the registration or
                         certification is based, and, where applicable, the classification obtained
                         in the official list</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:SubsidiaryTenderingCriterionPropertyGroup>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                         >92e44d3b-af8e-4a29-91a8-24d27aa27fee</cbc:ID>
-                    <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                    <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                         listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
                     <cac:TenderingCriterionProperty>
                         <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                            schemeVersionID="3.2.0">7a887325-ecab-4490-b17d-a0d6e71e090a</cbc:ID>
+                            schemeVersionID="3.2.0">c7abbda8-2fda-4896-811f-889417529d3e</cbc:ID>
                         <cbc:Description>Does the registration or certification cover all of the
                             required selection criteria?</cbc:Description>
-                        <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                        <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                             listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                        <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                        <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                             listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                     </cac:TenderingCriterionProperty>
                 </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11085,19 +11108,19 @@
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >59e6f3ef-15cd-4e21-82ac-ea497ccd44e2</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONFALSE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">87261b18-1a53-4e15-b707-9fa240bb4638</cbc:ID>
+                        schemeVersionID="3.2.0">d9ce77c8-fa90-4081-a189-606d09f392ad</cbc:ID>
                     <cbc:Description>Will the economic operator be able to provide a certificate
                         with regard to the payment of social security contributions and taxes or
                         provide information enabling the contracting authority or contracting entity
                         to obtaining it directly by accessing a national database in any Member
                         State that is available free of charge?</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11105,29 +11128,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">29bd09c6-b19c-4269-a187-038d2e9b58de</cbc:ID>
+                    schemeVersionID="3.2.0">705bb585-9645-40c4-90ec-e9d1d6f09f76</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">f81e6d13-48de-472a-84ed-8a1583b1ced8</cbc:ID>
+                        schemeVersionID="3.2.0">ca5c8e7a-561c-4f0e-ac6f-cc548855a257</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11144,55 +11167,55 @@
             together with others?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >d939f2c6-ba25-4dc4-889c-11d1853add19</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">d1321c04-45e0-408d-8426-5103639eae07</cbc:ID>
+                    schemeVersionID="3.2.0">5482ae7b-7f24-4af9-87c5-bb655b2011fb</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f5663c5a-d311-4ae4-be14-1575754be5f2</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c3cf2f11-9cdc-4f27-aaf3-8ce64dba951d</cbc:ID>
+                        schemeVersionID="3.2.0">9b76d9dd-58c6-4b93-b96e-cb27adbfdc64</cbc:ID>
                     <cbc:Description>Please indicate the role of the economic operator in the group
                         (leader, responsible for specific tasks...)</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">CODE</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1dd5da12-f819-4cf0-820b-a25b795b942f</cbc:ID>
+                        schemeVersionID="3.2.0">b6a791af-474d-45bc-9806-8a73c8909987</cbc:ID>
                     <cbc:Description>Please identify the other economic operators participating in
                         the procurement procedure together</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">4eab7108-8fbf-4a44-8e8a-82f27d73f5e1</cbc:ID>
+                        schemeVersionID="3.2.0">30624f7f-8d5f-47e7-815b-811a009a79b3</cbc:ID>
                     <cbc:Description>Where applicable, name of the participating
                         group:</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11200,29 +11223,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">2924e0a5-feca-48ca-9369-7b4a0c914abd</cbc:ID>
+                    schemeVersionID="3.2.0">955c3429-fa76-4b07-bca3-a1d654086beb</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">7a488534-54ea-4297-8521-66235ff845bf</cbc:ID>
+                        schemeVersionID="3.2.0">b99cfa50-f63c-4f1e-81f5-ed12f0cd9b6f</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11240,43 +11263,43 @@
             (if any) set out under Part V below?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >289f39b3-2a15-421a-8050-a29858031f35</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">cb2d3973-ea8a-4653-9717-dcf6dd05b6d7</cbc:ID>
+                    schemeVersionID="3.2.0">3e51b2f9-16dd-40d5-b0a2-41adc1d7d807</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >50e9a74e-969e-4d79-8e19-8af71cb7c54a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0ba1c2ed-af2e-4cee-9775-8b4e959bfd94</cbc:ID>
+                        schemeVersionID="3.2.0">47a15e92-4c8c-4c0e-a69b-6f08df9d2617</cbc:ID>
                     <cbc:Description>Name of the entity</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">1ba5eaee-4cc9-4dba-bc13-976bddb180b3</cbc:ID>
+                        schemeVersionID="3.2.0">2e0206cb-345f-4fb1-a373-56f3e451183a</cbc:ID>
                     <cbc:Description>ID of the entity</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11284,29 +11307,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">4a304c79-5427-4b15-b927-2272581b38d3</cbc:ID>
+                    schemeVersionID="3.2.0">011ecd2c-f7a7-4c56-b3b4-0d977ea37610</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">d073db97-df1e-4708-aeba-295077e85120</cbc:ID>
+                        schemeVersionID="3.2.0">f88908e7-dc8a-4c7f-a077-b4462dd6eb97</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11323,43 +11346,43 @@
             to third parties?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >289f39b3-2a15-421a-8050-a29858031f35</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">ed8407f8-0bd0-4590-97d6-c43b770db434</cbc:ID>
+                    schemeVersionID="3.2.0">d75d2420-9aa8-4eb6-a124-1acdefc466b6</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >50e9a74e-969e-4d79-8e19-8af71cb7c54a</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">5262ca83-3860-49af-885d-9ac75bc10849</cbc:ID>
+                        schemeVersionID="3.2.0">bb1ab9ff-fa3e-413a-a275-efc8a8fbe214</cbc:ID>
                     <cbc:Description>Name of the entity</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">0574ea3f-2fcf-45b4-a770-619ea5d2a0e5</cbc:ID>
+                        schemeVersionID="3.2.0">3b236e1e-ad4e-44c0-ae59-08f7bc78cb0a</cbc:ID>
                     <cbc:Description>ID of the subcontractor</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">ECONOMIC_OPERATOR_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11367,29 +11390,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">84258667-1d46-41c6-8bf2-e901367889fc</cbc:ID>
+                    schemeVersionID="3.2.0">b24f8e7a-b387-4744-954b-cbf8c941f259</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">e71c74da-3de7-4ad2-87b8-d6e48c6e5158</cbc:ID>
+                        schemeVersionID="3.2.0">b476c9a2-172b-408c-8cfd-6397f28eb111</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11407,34 +11430,34 @@
             candidates in the following way:</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >ecc69670-f428-4446-908f-689568ca0d0d</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">6b80e481-32a6-4093-9ede-426c2c964c73</cbc:ID>
+                    schemeVersionID="3.2.0">fa9aa377-ede2-4515-82af-c9363b27cd8f</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >f13754df-7e15-4155-aaa6-7ca6407baa47</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">c0073ff9-350a-4cbf-89b9-06dfa1efee17</cbc:ID>
+                        schemeVersionID="3.2.0">ba7737d7-dcbf-4e44-bd22-6395984be1f3</cbc:ID>
                     <cbc:Description>Please describe them</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">DESCRIPTION</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11442,29 +11465,29 @@
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >7458d42a-e581-4640-9283-34ceb3ad4345</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">a0478ef4-b8d6-4873-bf67-b360d1f94cfb</cbc:ID>
+                    schemeVersionID="3.2.0">25b2e4f7-5508-455f-881a-608922cc28d9</cbc:ID>
                 <cbc:Description>Is this information available electronically?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >41dd2e9b-1bfd-44c7-93ee-56bd74a4334b</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">113df3a1-d42b-43d1-9973-c01de4db264b</cbc:ID>
+                        schemeVersionID="3.2.0">64af9418-8797-4396-bcb6-1a5c5f24e50e</cbc:ID>
                     <cbc:Description>Evidence Supplied</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">EVIDENCE_IDENTIFIER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
@@ -11481,43 +11504,43 @@
             Enterprise?</cbc:Description>
         <cac:ProcurementProjectLotReference>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
-                >LOT-00000</cbc:ID>
+                >LOT-0000</cbc:ID>
         </cac:ProcurementProjectLotReference>
         <cac:TenderingCriterionPropertyGroup>
             <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                 >0aef9d77-7bcd-411e-b49e-f6b6cd47312c</cbc:ID>
-            <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+            <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                 listVersionID="3.2.0">ON*</cbc:PropertyGroupTypeCode>
             <cac:TenderingCriterionProperty>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                    schemeVersionID="3.2.0">5b8435df-19c6-4d20-89c7-fc0d1cb4f17e</cbc:ID>
+                    schemeVersionID="3.2.0">d617d4c4-8444-4e26-85d9-4c262092bb06</cbc:ID>
                 <cbc:Description>Your answer?</cbc:Description>
-                <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP" listVersionID="3.2.0"
-                    >QUESTION</cbc:TypeCode>
-                <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
+                    listVersionID="3.2.0">QUESTION</cbc:TypeCode>
+                <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                     listVersionID="3.2.0">INDICATOR</cbc:ValueDataTypeCode>
             </cac:TenderingCriterionProperty>
             <cac:SubsidiaryTenderingCriterionPropertyGroup>
                 <cbc:ID schemeID="Criterion" schemeAgencyID="OP" schemeVersionID="3.2.0"
                     >5ee707fa-21fa-4966-9c1e-b9b4a98b6e98</cbc:ID>
-                <cbc:PropertyGroupTypeCode listID="PropertyGroupType" listAgencyID="OP"
+                <cbc:PropertyGroupTypeCode listID="property-group-type" listAgencyID="OP"
                     listVersionID="3.2.0">ONTRUE</cbc:PropertyGroupTypeCode>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">a50c818f-2c1c-46c5-9740-a2699d2bffd6</cbc:ID>
+                        schemeVersionID="3.2.0">e956215e-36b2-431a-85bd-3d91e08e41bb</cbc:ID>
                     <cbc:Description>Number of employees</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUANTITY_INTEGER</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
                 <cac:TenderingCriterionProperty>
                     <cbc:ID schemeID="Criterion" schemeAgencyID="XXXESPD-SERVICEXXX"
-                        schemeVersionID="3.2.0">008859f7-8773-4686-8c9a-7998cf2fcb96</cbc:ID>
+                        schemeVersionID="3.2.0">c742b72f-f79b-4a49-8f1a-17634a491b64</cbc:ID>
                     <cbc:Description>Turnover</cbc:Description>
-                    <cbc:TypeCode listID="CriterionElementType" listAgencyID="OP"
+                    <cbc:TypeCode listID="criterion-element-type" listAgencyID="OP"
                         listVersionID="3.2.0">QUESTION</cbc:TypeCode>
-                    <cbc:ValueDataTypeCode listID="ResponseDataType" listAgencyID="OP"
+                    <cbc:ValueDataTypeCode listID="response-data-type" listAgencyID="OP"
                         listVersionID="3.2.0">AMOUNT</cbc:ValueDataTypeCode>
                 </cac:TenderingCriterionProperty>
             </cac:SubsidiaryTenderingCriterionPropertyGroup>
diff --git a/validation/common/sch/01-ESPD-common-cl-attributes.sch b/validation/common/sch/01-ESPD-common-cl-attributes.sch
index 69a1abc4..cda38cd4 100644
--- a/validation/common/sch/01-ESPD-common-cl-attributes.sch
+++ b/validation/common/sch/01-ESPD-common-cl-attributes.sch
@@ -38,7 +38,7 @@
         <rule context="cbc:TypeCode">
             <!--(CriterionElementType)-->            
             <assert test="(false() or not(@listName != 'CriterionElementType'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listName"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listName = CriterionElementType'.</assert>
-            <assert test="(false() or not(@listID != 'CriterionElementType'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = CriterionElementType'.</assert>
+            <assert test="(false() or not(@listID != 'criterion-element-type'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = criterion-element-type'.</assert>
             <assert test="(false() or not(@listSchemeURI != 'https://github.com/ESPD/ESPD-EDM/tree/v3.2.0/codelists/gc/CriterionElementType.gc'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listSchemeURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listSchemeURI = https://github.com/ESPD/ESPD-EDM/tree/v3.2.0/codelists/gc/CriterionElementType.gc'.</assert>
             <assert test="(false() or not(@listURI != 'https://github.com/ESPD/ESPD-EDM'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listURI = https://github.com/ESPD/ESPD-EDM'.</assert>
         </rule>
@@ -71,14 +71,14 @@
         <rule context="cac:TenderingCriterionPropertyGroup/cbc:PropertyGroupTypeCode">
             <!--(PropertyGroupType)-->
             <assert test="(false() or not(@listName != 'PropertyGroupType'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listName"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listName = PropertyGroupType'.</assert>
-            <assert test="(false() or not(@listID != 'PropertyGroupType'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = PropertyGroupType'.</assert>
+            <assert test="(false() or not(@listID != 'property-group-type'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = property-group-type'.</assert>
             <assert test="(false() or not(@listSchemeURI != 'https://github.com/ESPD/ESPD-EDM/tree/v3.2.0/codelists/gc/PropertyGroupType.gc'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listSchemeURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listSchemeURI = https://github.com/ESPD/ESPD-EDM/tree/v3.2.0/codelists/gc/PropertyGroupType.gc'.</assert>
             <assert test="(false() or not(@listURI != 'https://github.com/ESPD/ESPD-EDM'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listURI = https://github.com/ESPD/ESPD-EDM'.</assert>
         </rule>
         <rule context="cac:TenderingCriterionProperty/cbc:ValueDataTypeCode">
             <!--(ResponseDataType)-->
             <assert test="(false() or not(@listName != 'ResponseDataType'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listName"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listName = ResponseDataType'.</assert>
-            <assert test="(false() or not(@listID != 'ResponseDataType'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = ResponseDataType'.</assert>
+            <assert test="(false() or not(@listID != 'response-data-type'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = response-data-type'.</assert>
             <assert test="(false() or not(@listSchemeURI != 'https://github.com/ESPD/ESPD-EDM/tree/v3.2.0/codelists/gc/ResponseDataType.gc'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listSchemeURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listSchemeURI = https://github.com/ESPD/ESPD-EDM/tree/v3.2.0/codelists/gc/ResponseDataType.gc'.</assert>
             <assert test="(false() or not(@listURI != 'https://github.com/ESPD/ESPD-EDM'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listURI = https://github.com/ESPD/ESPD-EDM'.</assert>
         </rule>