diff --git a/PDF_UA/PDFUA-1.xml b/PDF_UA/PDFUA-1.xml
index 322e8f57..e1f769ff 100644
--- a/PDF_UA/PDFUA-1.xml
+++ b/PDF_UA/PDFUA-1.xml
@@ -113,7 +113,7 @@
         <rule object="SENonStandard" tags="structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="5"/>
             <description>All non-standard structure types shall be mapped to the nearest functionally equivalent standard type, as defined in ISO 32000-1:2008, 14.8.4, in the role map dictionary of the structure tree root. This mapping may be indirect; within the role map a non-standard type can map directly to another non-standard type, but eventually the mapping shall terminate at a standard type</description>
-            <test>circularMappingExist == true</test>
+            <test>isNotMappedToStandardType == false</test>
             <error>
                 <message>Non-standard structure type %1 is not mapped to a standard type</message>
                 <arguments>
@@ -139,11 +139,11 @@
         <rule object="PDStructElem" tags="structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="7"/>
             <description>Standard tags defined in ISO 32000-1:2008, 14.8.4, shall not be remapped</description>
-            <test>isRemappedStandardType == false</test>
+            <test>remappedStandardType == null</test>
             <error>
                 <message>Standard type %1 is remapped</message>
                 <arguments>
-                    <argument>valueS</argument>
+                    <argument>remappedStandardType</argument>
                 </arguments>
             </error>
             <references>
diff --git a/PDF_UA/PDFUA-2-ISO32005.xml b/PDF_UA/PDFUA-2-ISO32005.xml
index c6c19c22..2a6fec38 100644
--- a/PDF_UA/PDFUA-2-ISO32005.xml
+++ b/PDF_UA/PDFUA-2-ISO32005.xml
@@ -101,7 +101,7 @@
         <rule object="SENonStandard">
             <id specification="ISO_14289_2" clause="8.2.4" testNumber="1"/>
             <description>All structure elements shall belong to, or be role mapped to, at least one of the following namespaces specified in ISO 32000-2:2020, 14.8.6: — the PDF 1.7 namespace; — the PDF 2.0 namespace; — the MathML namespace</description>
-            <test>circularMappingExist == true</test>
+            <test>isNotMappedToStandardType == false</test>
             <error>
                 <message>Non-standard structure type %1 is not mapped to a standard type</message>
                 <arguments>
@@ -136,6 +136,20 @@
             </error>
             <references/>
         </rule>
+        <rule object="SENonStandard">
+            <id specification="ISO_14289_2" clause="8.2.4" testNumber="4"/>
+            <description>All structure elements shall belong to, or be role mapped to, at least one of the following namespaces specified in ISO 32000-2:2020, 14.8.6: — the PDF 1.7 namespace; — the PDF 2.0 namespace; — the MathML namespace</description>
+            <test>remappedStandardType == null</test>
+            <error>
+                <message>The standard structure type %1 is remapped to a non-standard type</message>
+                <arguments>
+                    <argument>remappedStandardType</argument>
+                </arguments>
+            </error>
+            <references>
+                <reference specification="ISO 32000-2:2020" clause="14.8.6"/>
+            </references>
+        </rule>
         <rule object="PDStructTreeRoot">
             <id specification="ISO_14289_2" clause="8.2.5.2" testNumber="1"/>
             <description>The structure tree root shall contain a single Document structure element as its only child, as specified in ISO 32000-2:2020, Annex L and ISO/TS 32005</description>
diff --git a/PDF_UA/PDFUA-2.xml b/PDF_UA/PDFUA-2.xml
index ef6b42ea..081e1b65 100644
--- a/PDF_UA/PDFUA-2.xml
+++ b/PDF_UA/PDFUA-2.xml
@@ -101,7 +101,7 @@
         <rule object="SENonStandard">
             <id specification="ISO_14289_2" clause="8.2.4" testNumber="1"/>
             <description>All structure elements shall belong to, or be role mapped to, at least one of the following namespaces specified in ISO 32000-2:2020, 14.8.6: — the PDF 1.7 namespace; — the PDF 2.0 namespace; — the MathML namespace</description>
-            <test>circularMappingExist == true</test>
+            <test>isNotMappedToStandardType == false</test>
             <error>
                 <message>Non-standard structure type %1 is not mapped to a standard type</message>
                 <arguments>
@@ -136,6 +136,20 @@
             </error>
             <references/>
         </rule>
+        <rule object="SENonStandard">
+            <id specification="ISO_14289_2" clause="8.2.4" testNumber="4"/>
+            <description>All structure elements shall belong to, or be role mapped to, at least one of the following namespaces specified in ISO 32000-2:2020, 14.8.6: — the PDF 1.7 namespace; — the PDF 2.0 namespace; — the MathML namespace</description>
+            <test>remappedStandardType == null</test>
+            <error>
+                <message>The standard structure type %1 is remapped to a non-standard type</message>
+                <arguments>
+                    <argument>remappedStandardType</argument>
+                </arguments>
+            </error>
+            <references>
+                <reference specification="ISO 32000-2:2020" clause="14.8.6"/>
+            </references>
+        </rule>
         <rule object="PDStructTreeRoot">
             <id specification="ISO_14289_2" clause="8.2.5.2" testNumber="1"/>
             <description>The structure tree root shall contain a single Document structure element as its only child, as specified in ISO 32000-2:2020, Annex L and ISO/TS 32005</description>
diff --git a/PDF_UA/WCAG-2-2-Complete.xml b/PDF_UA/WCAG-2-2-Complete.xml
index bf635799..ee03ae1b 100644
--- a/PDF_UA/WCAG-2-2-Complete.xml
+++ b/PDF_UA/WCAG-2-2-Complete.xml
@@ -55,7 +55,7 @@
         <rule object="SENonStandard" tags="major,machine,structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="5"/>
             <description>All non-standard structure types shall be mapped to the nearest functionally equivalent standard type, as defined in ISO 32000-1:2008, 14.8.4, in the role map dictionary of the structure tree root. This mapping may be indirect; within the role map a non-standard type can map directly to another non-standard type, but eventually the mapping shall terminate at a standard type</description>
-            <test>circularMappingExist == true</test>
+            <test>isNotMappedToStandardType == false</test>
             <error>
                 <message>Non-standard structure type %1 is not mapped to a standard type</message>
                 <arguments>
@@ -81,11 +81,11 @@
         <rule object="PDStructElem" tags="major,machine,structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="7"/>
             <description>Standard tags defined in ISO 32000-1:2008, 14.8.4, shall not be remapped</description>
-            <test>isRemappedStandardType == false</test>
+            <test>remappedStandardType == null</test>
             <error>
                 <message>Standard type %1 is remapped</message>
                 <arguments>
-                    <argument>valueS</argument>
+                    <argument>remappedStandardType</argument>
                 </arguments>
             </error>
             <references>
diff --git a/PDF_UA/WCAG-2-2-Machine.xml b/PDF_UA/WCAG-2-2-Machine.xml
index 00d6da74..49cab6b5 100644
--- a/PDF_UA/WCAG-2-2-Machine.xml
+++ b/PDF_UA/WCAG-2-2-Machine.xml
@@ -55,7 +55,7 @@
         <rule object="SENonStandard" tags="major,machine,structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="5"/>
             <description>All non-standard structure types shall be mapped to the nearest functionally equivalent standard type, as defined in ISO 32000-1:2008, 14.8.4, in the role map dictionary of the structure tree root. This mapping may be indirect; within the role map a non-standard type can map directly to another non-standard type, but eventually the mapping shall terminate at a standard type</description>
-            <test>circularMappingExist == true</test>
+            <test>isNotMappedToStandardType == false</test>
             <error>
                 <message>Non-standard structure type %1 is not mapped to a standard type</message>
                 <arguments>
@@ -81,11 +81,11 @@
         <rule object="PDStructElem" tags="major,machine,structure">
             <id specification="ISO_14289_1" clause="7.1" testNumber="7"/>
             <description>Standard tags defined in ISO 32000-1:2008, 14.8.4, shall not be remapped</description>
-            <test>isRemappedStandardType == false</test>
+            <test>remappedStandardType == null</test>
             <error>
                 <message>Standard type %1 is remapped</message>
                 <arguments>
-                    <argument>valueS</argument>
+                    <argument>remappedStandardType</argument>
                 </arguments>
             </error>
             <references>