diff --git a/rules/peppol-invitation-to-tender/PEPPOL-T024.sch b/rules/peppol-invitation-to-tender/PEPPOL-T024.sch
index d9ff80eb..9f4528d1 100644
--- a/rules/peppol-invitation-to-tender/PEPPOL-T024.sch
+++ b/rules/peppol-invitation-to-tender/PEPPOL-T024.sch
@@ -39,7 +39,7 @@
 
         <rule context="ubl:CallForTenders/cbc:UBLVersionID">
 
-            <assert id="PEPPOL-T024-R039" flag="fatal" test="normalize-space(.) = '2.2'">[PEPPOL-T024-R039] UBLVersionID value MUST be '2.2'</assert>
+            <assert id="PEPPOL-T024-R040" flag="fatal" test="normalize-space(.) = '2.2'">[PEPPOL-T024-R040] UBLVersionID value MUST be '2.2'</assert>
             <report id="PEPPOL-T024-S302" flag="warning" test="./@*"><value-of select="$syntaxError"/>[PEPPOL-T024-S302] UBLVersionID SHOULD NOT contain any attributes.</report>
         </rule>
 
@@ -184,7 +184,7 @@
         </rule>
 
         <rule context="cbc:IndustryClassificationCode">
-            <assert id="PEPPOL-T024-R0038" flags="fatal" test="./@listID">[PEPPOL-T024-R038] The Codelist used to define the receiver's economic operator role in this tender MUST be named by using the attribute listID and the ID has to be /"TendererRole/".</assert>
+            <assert id="PEPPOL-T024-R041" flags="fatal" test="./@listID">[PEPPOL-T024-R041] The Codelist used to define the receiver's economic operator role in this tender MUST be named by using the attribute listID and the ID has to be /"tendererRole/".</assert>
             <report id="PEPPOL-T024-S360" flag="warning" test="./@*[not(name()='listID')]"><value-of select="$syntaxError"/>[PEPPOL-T024-S360] cbc:IndustryClassificationCode SHOULD NOT have any further attributes but listID</report>
         </rule>
 
@@ -275,7 +275,7 @@
 
         <rule context="ubl:CallForTenders/cac:TenderingProcess/cbc:ContractingSystemCode">
             <report id="PEPPOL-T024-S397" flag="warning" test="./@*[not(name()='listID')]"><value-of select="$syntaxError"/>[PEPPOL-T024-S397] ContractingSystemCode SHOULD NOT have any attributes but listID.</report>
-            <assert id="PEPPOL-T024-R038" flag="fatal" test="not (cbc:ContractingSystemCode in ('1', '2', '3')">[PEPPOL-T024-R038] A Call For Tender is only allowed to use une of the following ContractSystemCodes: 'Public Contract', 'Establishment of a Framework agreement' or 'Setting up a Dynamic Purchasing System'.</assert>        </rule>
+            <assert id="PEPPOL-T024-R039" flag="fatal" test="not (cbc:ContractingSystemCode in ('1', '2', '3')">[PEPPOL-T024-R039] A Call For Tender is only allowed to use une of the following ContractSystemCodes: 'Public Contract', 'Establishment of a Framework agreement' or 'Setting up a Dynamic Purchasing System'.</assert>        </rule>
 
         <rule context="ubl:CallForTenders/cac:TenderingProcess/cbc:SubmissionMethodCode">
             <report id="PEPPOL-T024-S372" flag="warning" test="./@*[not(name()='listID')]"><value-of select="$syntaxError"/>[PEPPOL-T024-S372] SubmissionMethodCode SHOULD NOT have any attributes but listID.</report>
diff --git a/structure/syntax/CallForTenders.xml b/structure/syntax/CallForTenders.xml
index ef7d7856..ce907a5b 100644
--- a/structure/syntax/CallForTenders.xml
+++ b/structure/syntax/CallForTenders.xml
@@ -8,7 +8,7 @@
     <Namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</Namespace>
     <Document>
 
-        <Term>t024:InvitationToTender</Term>
+        <Term>t004:CallForTenders</Term>
         <Name>Invitation to tender, root element</Name>
 
         <Element>
diff --git a/structure/syntax/InvitationToTender.xml b/structure/syntax/InvitationToTender.xml
index 2306e143..7d433a0d 100644
--- a/structure/syntax/InvitationToTender.xml
+++ b/structure/syntax/InvitationToTender.xml
@@ -8,7 +8,7 @@
     <Namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</Namespace>
     <Document>
 
-        <Term>t024:InvitationToTender</Term>
+        <Term>t024:CallForTenders</Term>
         <Name>Invitation To Tender, root element</Name>
 
         <Element>
@@ -16,7 +16,7 @@
             <Name>UBL version identifier</Name>
             <Description>Requires UBL version 2.2</Description>
             <Reference type="RULE">PEPPOL-T024-R001</Reference>
-            <Reference type="RULE">PEPPOL-T024-R039</Reference>
+            <Reference type="RULE">PEPPOL-T024-R040</Reference>
             <Value type="FIXED">2.2</Value>
         </Element>
 
@@ -346,11 +346,13 @@
                 <Term>cbc:IndustryClassificationCode</Term>
                 <Name>Economic operator role</Name>
                 <Description>The role of the economic operator when bidding from a consortium (main contractor, subcontractor , additional).</Description>
+                <Reference type="CODE_LIST">tendererRole</Reference>
                 <Attribute>
                     <Term>listID</Term>
-                    <Name>The identification of a list of codes.</Name>
-                    <Reference type="RULE">PEPPOL-T024-R0038</Reference>
-                    <Reference type="RULE">PEPPOL-T024-S0360</Reference>
+                    <Name>List identifier</Name>
+                    <Reference type="RULE">PEPPOL-T024-R041</Reference>
+                    <Reference type="RULE">PEPPOL-T024-S360</Reference>
+                    <Value type="FIXED">tendererRole</Value>
                 </Attribute>
                 <DataType>Identifier</DataType>
             </Element>
@@ -638,6 +640,7 @@
                     indicates whether the new contract will be based on an already established framework agreement or
                     dynamic purchasing system or not.
                 </Description>
+                <Reference type="RULE">PEPPOL-T024-R039</Reference>
                 <Reference type="CODE_LIST">contractType</Reference>
                 <Attribute>
                     <Term>listID</Term>