diff --git a/PDF_UA/PDFUA-1.xml b/PDF_UA/PDFUA-1.xml
index e1f769ff..37726e0e 100644
--- a/PDF_UA/PDFUA-1.xml
+++ b/PDF_UA/PDFUA-1.xml
@@ -18,7 +18,7 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_1" clause="5" testNumber="2"/>
-            <description>The value of pdfuaid:part shall be the part number of the International Standard to which the file conforms</description>
+            <description>The value of "pdfuaid:part" shall be the part number of the International Standard to which the file conforms</description>
             <test>part == 1</test>
             <error>
                 <message>The "part" property of the PDF/UA Identification Schema is %1 instead of 1 for PDF/UA-1 conforming file</message>
@@ -30,10 +30,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_1" clause="5" testNumber="3"/>
-            <description>Property part of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "part" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>partPrefix == null || partPrefix == "pdfuaid"</test>
             <error>
-                <message>Property part of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "part" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>partPrefix</argument>
                 </arguments>
@@ -42,10 +42,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_1" clause="5" testNumber="4"/>
-            <description>Property amd of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "amd" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>amdPrefix == null || amdPrefix == "pdfuaid"</test>
             <error>
-                <message>Property amd of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "amd" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>amdPrefix</argument>
                 </arguments>
@@ -54,10 +54,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_1" clause="5" testNumber="5"/>
-            <description>Property corr of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "corr" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>corrPrefix == null || corrPrefix == "pdfuaid"</test>
             <error>
-                <message>Property corr of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "corr" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>corrPrefix</argument>
                 </arguments>
@@ -199,10 +199,10 @@
         </rule>
         <rule object="PDStructElem" tags="structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="12"/>
-            <description>A struct element shall contain the P entry according to ISO 32000-1:2008, 14.7.2, Table 355</description>
+            <description>A structure element dictionary shall contain the P (parent) entry according to ISO 32000-1:2008, 14.7.2, Table 355</description>
             <test>containsParent == true</test>
             <error>
-                <message>A struct element does not contain the P entry</message>
+                <message>A structure element dictionary does not contain the P (parent) entry</message>
                 <arguments/>
             </error>
             <references>
diff --git a/PDF_UA/PDFUA-2-ISO32005.xml b/PDF_UA/PDFUA-2-ISO32005.xml
index 3b62f27f..6ce98a32 100644
--- a/PDF_UA/PDFUA-2-ISO32005.xml
+++ b/PDF_UA/PDFUA-2-ISO32005.xml
@@ -18,7 +18,7 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="2"/>
-            <description>The value of pdfuaid:part shall be the part number of the International Standard to which the file conforms</description>
+            <description>The value of "pdfuaid:part" shall be the part number of the International Standard to which the file conforms</description>
             <test>part == 2</test>
             <error>
                 <message>The "part" property of the PDF/UA Identification Schema is %1 instead of 2 for PDF/UA-2 conforming file</message>
@@ -30,10 +30,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="3"/>
-            <description>Property part of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "part" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>partPrefix == null || partPrefix == "pdfuaid"</test>
             <error>
-                <message>Property part of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "part" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>partPrefix</argument>
                 </arguments>
@@ -42,10 +42,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="4"/>
-            <description>Property rev of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "rev" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>revPrefix == null || revPrefix == "pdfuaid"</test>
             <error>
-                <message>Property rev of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "rev" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>revPrefix</argument>
                 </arguments>
@@ -54,10 +54,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="5"/>
-            <description>The value of pdfuaid:rev shall be the four digit year</description>
+            <description>The value of "pdfuaid:rev" shall be the four digit year</description>
             <test>/^\d{4}$/.test(rev)</test>
             <error>
-                <message>The value of pdfuaid:rev (%1) not the four digit year</message>
+                <message>The value of "pdfuaid:rev" (%1) not the four digit year</message>
                 <arguments>
                     <argument>rev</argument>
                 </arguments>
@@ -78,10 +78,10 @@
         </rule>
         <rule object="PDStructElem" tags="structure">
             <id specification="ISO_14289_2" clause="8.2.1" testNumber="2"/>
-            <description>Struct element shall contain the P entry according to ISO 32000-2:2020, 14.7.2, Table 323</description>
+            <description>A structure element dictionary shall contain the P (parent) entry according to ISO 32000-2:2020, 14.7.2, Table 323</description>
             <test>containsParent == true</test>
             <error>
-                <message>A struct element does not contain the P entry</message>
+                <message>A structure element dictionary does not contain the P (parent) entry</message>
                 <arguments/>
             </error>
             <references>
@@ -186,7 +186,7 @@
         </rule>
         <rule object="SETOCI" tags="structure,toc">
             <id specification="ISO_14289_2" clause="8.2.5.8" testNumber="1"/>
-            <description>Each TOCI in the table of contents shall identify the target of the reference using the Ref entry, either directly on the TOCI structure element itself or on a child structure element contained within</description>
+            <description>Each TOCI in the table of contents shall identify the target of the reference using the Ref entry, either directly on the TOCI structure element itself or on one of its child structure elements</description>
             <test>containsRef == true</test>
             <error>
                 <message>TOCI in the TOC does not contain the Ref entry, neither directly on the TOCI structure element itself nor on its descendant structure elements</message>
@@ -216,7 +216,7 @@
         </rule>
         <rule object="SEFENote" deferred="true" tags="structure,note">
             <id specification="ISO_14289_2" clause="8.2.5.14" testNumber="2"/>
-            <description>Real content that refers to footnotes or endnotes (real content enclosed in FENote structure elements) shall use the Ref entry as specified in 8.8 on the referring structure element to reference the FENote. The corresponding FENote shall also use the Ref entry to identify all citations that reference it</description>
+            <description>Real content that refers to footnotes or endnotes (real content enclosed in FENote structure elements) shall use the Ref entry on the referring structure element to reference the FENote. The corresponding FENote shall also use the Ref entry to identify all citations that reference it</description>
             <test>orphanRefs == null</test>
             <error>
                 <message>Ref entry in the FENote does not reference structure elements with object numbers %1, while these structure elements reference this FENote</message>
diff --git a/PDF_UA/PDFUA-2.xml b/PDF_UA/PDFUA-2.xml
index e2f97663..c5cb3a1d 100644
--- a/PDF_UA/PDFUA-2.xml
+++ b/PDF_UA/PDFUA-2.xml
@@ -18,7 +18,7 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="2"/>
-            <description>The value of pdfuaid:part shall be the part number of the International Standard to which the file conforms</description>
+            <description>The value of "pdfuaid:part" shall be the part number of the International Standard to which the file conforms</description>
             <test>part == 2</test>
             <error>
                 <message>The "part" property of the PDF/UA Identification Schema is %1 instead of 2 for PDF/UA-2 conforming file</message>
@@ -30,10 +30,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="3"/>
-            <description>Property part of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "part" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>partPrefix == null || partPrefix == "pdfuaid"</test>
             <error>
-                <message>Property part of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "part" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>partPrefix</argument>
                 </arguments>
@@ -42,10 +42,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="4"/>
-            <description>Property rev of the PDF/UA Identification Schema shall have namespace prefix pdfuaid</description>
+            <description>Property "rev" of the PDF/UA Identification Schema shall have namespace prefix "pdfuaid"</description>
             <test>revPrefix == null || revPrefix == "pdfuaid"</test>
             <error>
-                <message>Property rev of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
+                <message>Property "rev" of the PDF/UA Identification Schema has invalid namespace prefix %1</message>
                 <arguments>
                     <argument>revPrefix</argument>
                 </arguments>
@@ -54,10 +54,10 @@
         </rule>
         <rule object="PDFUAIdentification" tags="metadata">
             <id specification="ISO_14289_2" clause="5" testNumber="5"/>
-            <description>The value of pdfuaid:rev shall be the four digit year</description>
+            <description>The value of "pdfuaid:rev" shall be the four digit year</description>
             <test>/^\d{4}$/.test(rev)</test>
             <error>
-                <message>The value of pdfuaid:rev (%1) not the four digit year</message>
+                <message>The value of "pdfuaid:rev" (%1) not the four digit year</message>
                 <arguments>
                     <argument>rev</argument>
                 </arguments>
@@ -78,10 +78,10 @@
         </rule>
         <rule object="PDStructElem" tags="structure">
             <id specification="ISO_14289_2" clause="8.2.1" testNumber="2"/>
-            <description>Struct element shall contain the P entry according to ISO 32000-2:2020, 14.7.2, Table 323</description>
+            <description>A structure element dictionary shall contain the P (parent) entry according to ISO 32000-2:2020, 14.7.2, Table 323</description>
             <test>containsParent == true</test>
             <error>
-                <message>A struct element does not contain the P entry</message>
+                <message>A structure element dictionary does not contain the P (parent) entry</message>
                 <arguments/>
             </error>
             <references>
@@ -186,7 +186,7 @@
         </rule>
         <rule object="SETOCI" tags="structure,toc">
             <id specification="ISO_14289_2" clause="8.2.5.8" testNumber="1"/>
-            <description>Each TOCI in the table of contents shall identify the target of the reference using the Ref entry, either directly on the TOCI structure element itself or on a child structure element contained within</description>
+            <description>Each TOCI in the table of contents shall identify the target of the reference using the Ref entry, either directly on the TOCI structure element itself or on one of its child structure elements</description>
             <test>containsRef == true</test>
             <error>
                 <message>TOCI in the TOC does not contain the Ref entry, neither directly on the TOCI structure element itself nor on its descendant structure elements</message>
@@ -216,7 +216,7 @@
         </rule>
         <rule object="SEFENote" deferred="true" tags="structure,note">
             <id specification="ISO_14289_2" clause="8.2.5.14" testNumber="2"/>
-            <description>Real content that refers to footnotes or endnotes (real content enclosed in FENote structure elements) shall use the Ref entry as specified in 8.8 on the referring structure element to reference the FENote. The corresponding FENote shall also use the Ref entry to identify all citations that reference it</description>
+            <description>Real content that refers to footnotes or endnotes (real content enclosed in FENote structure elements) shall use the Ref entry on the referring structure element to reference the FENote. The corresponding FENote shall also use the Ref entry to identify all citations that reference it</description>
             <test>orphanRefs == null</test>
             <error>
                 <message>Ref entry in the FENote does not reference structure elements with object numbers %1, while these structure elements reference this FENote</message>
diff --git a/PDF_UA/WCAG-2-2-Complete.xml b/PDF_UA/WCAG-2-2-Complete.xml
index 30d4bfcb..0795c5a8 100644
--- a/PDF_UA/WCAG-2-2-Complete.xml
+++ b/PDF_UA/WCAG-2-2-Complete.xml
@@ -141,10 +141,10 @@
         </rule>
         <rule object="PDStructElem" tags="critical,machine,structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="12"/>
-            <description>A struct element shall contain the P entry according to ISO 32000-1:2008, 14.7.2, Table 355</description>
+            <description>A structure element dictionary shall contain the P (parent) entry according to ISO 32000-1:2008, 14.7.2, Table 355</description>
             <test>containsParent == true</test>
             <error>
-                <message>A struct element does not contain the P entry</message>
+                <message>A structure element dictionary does not contain the P (parent) entry</message>
                 <arguments/>
             </error>
             <references>
diff --git a/PDF_UA/WCAG-2-2-Machine.xml b/PDF_UA/WCAG-2-2-Machine.xml
index 8456e9de..a2f81762 100644
--- a/PDF_UA/WCAG-2-2-Machine.xml
+++ b/PDF_UA/WCAG-2-2-Machine.xml
@@ -141,10 +141,10 @@
         </rule>
         <rule object="PDStructElem" tags="critical,machine,structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="12"/>
-            <description>A struct element shall contain the P entry according to ISO 32000-1:2008, 14.7.2, Table 355</description>
+            <description>A structure element dictionary shall contain the P (parent) entry according to ISO 32000-1:2008, 14.7.2, Table 355</description>
             <test>containsParent == true</test>
             <error>
-                <message>A struct element does not contain the P entry</message>
+                <message>A structure element dictionary does not contain the P (parent) entry</message>
                 <arguments/>
             </error>
             <references>