diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml
index c39b90d57..322e8f57b 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml
@@ -67,11 +67,11 @@
         <rule object="SEMarkedContent" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="1"/>
             <description>Content marked as Artifact should not present inside tagged content</description>
-            <test>tag != 'Artifact' || parentStructureTag == null</test>
+            <test>tag != 'Artifact' || isTaggedContent == false</test>
             <error>
-                <message>Content marked as Artifact is present inside tagged content (tag %1)</message>
+                <message>Content marked as Artifact is present inside tagged content (parent struct element %1)</message>
                 <arguments>
-                    <argument>parentStructureTag</argument>
+                    <argument>parentStructureElementObjectKey</argument>
                 </arguments>
             </error>
             <references/>
@@ -79,11 +79,11 @@
         <rule object="SEMarkedContent" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="2"/>
             <description>Tagged content should not present inside content marked as Artifact</description>
-            <test>parentStructureTag == null || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length == 0</test>
+            <test>isTaggedContent == false || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length == 0</test>
             <error>
-                <message>Tagged content (tag %1) is present inside content marked as Artifact</message>
+                <message>Tagged content (parent struct element %1) is present inside content marked as Artifact</message>
                 <arguments>
-                    <argument>parentStructureTag</argument>
+                    <argument>parentStructureElementObjectKey</argument>
                 </arguments>
             </error>
             <references/>
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="3"/>
             <description>Content shall be marked as Artifact or tagged as real content</description>
-            <test>parentStructureTag != null || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2.xml
index 3af8ea799..ef6b42ea1 100644
--- a/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2.xml
+++ b/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2.xml
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem">
             <id specification="ISO_14289_2" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>parentStructureTag != null || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>
@@ -438,17 +438,17 @@
             <description>The ActualText entry shall not contain any PUA values</description>
             <test>containsPUA == false</test>
             <error>
-                <message>The ActualText entry contains a Private Unicoide Area value</message>
+                <message>The ActualText entry contains a Private Unicode Area value</message>
                 <arguments/>
             </error>
             <references/>
         </rule>
-        <rule object="CosActualText">
+        <rule object="CosAlt">
             <id specification="ISO_14289_2" clause="8.4.3" testNumber="3"/>
             <description>The Alt entry shall not contain any PUA values</description>
             <test>containsPUA == false</test>
             <error>
-                <message>The Alt entry contains a Private Unicoide Area value</message>
+                <message>The Alt entry contains a Private Unicode Area value</message>
                 <arguments/>
             </error>
             <references/>
@@ -668,7 +668,7 @@
         <rule object="SESimpleContentItem">
             <id specification="ISO_14289_2" clause="8.5.1" testNumber="1"/>
             <description>Real content that does not possess the semantics of text objects and does not have an alternate textual representation shall be enclosed within Figure or Formula structure elements as appropriate</description>
-            <test>itemType == 'text' || parentStructureTag == null || ActualText != null || isArtifact == true || isFigure == true || isFormula == true</test>
+            <test>itemType == 'text' || isTaggedContent == false || ActualText != null || isArtifact == true || isFigure == true || isFormula == true</test>
             <error>
                 <message>Real content that does not possess the semantics of text objects and does not have an alternate textual representation is not enclosed within Figure or Formula structure elements</message>
                 <arguments/>