diff --git a/resources/validations/src/ssp.sch b/resources/validations/src/ssp.sch
index eca204db9..81843b6d0 100644
--- a/resources/validations/src/ssp.sch
+++ b/resources/validations/src/ssp.sch
@@ -242,7 +242,7 @@
         <sch:let name="registry-ns" value="$registry/f:fedramp-values/f:namespace/f:ns/@ns"/>
         <sch:let name="status" value="./o:annotation[@name='implementation-status']/@value"/>
         <sch:let name="corrections" value="lv:correct($registry/f:fedramp-values/f:value-set[@name='control-implementation-status'], $status)"/>
-        <sch:let name="required-response-points" value="$selected-profile/o:catalog//o:part[@name='item' and o:prop[@name='response-point' and @ns=$registry-ns]]"/>
+        <sch:let name="required-response-points" value="$selected-profile/o:catalog//o:part[@name='item']"/>
         <sch:let name="implemented" value="/o:system-security-plan/o:control-implementation/o:implemented-requirement/o:statement"/>
         <sch:let name="missing" value="$required-response-points[not(@id = $implemented/@statement-id)]"/>
         <sch:assert role="error" id="invalid-implementation-status" test="not(exists($corrections))">Invalid status '<sch:value-of select="$status"/>' for <sch:value-of select="./@control-id"/>, must be <sch:value-of select="$corrections"/></sch:assert>
diff --git a/resources/validations/test/demo/FedRAMP-SSP-OSCAL-Template.xml b/resources/validations/test/demo/FedRAMP-SSP-OSCAL-Template.xml
index 25caa360f..954d7a662 100644
--- a/resources/validations/test/demo/FedRAMP-SSP-OSCAL-Template.xml
+++ b/resources/validations/test/demo/FedRAMP-SSP-OSCAL-Template.xml
@@ -1026,7 +1026,7 @@
          <set-parameter param-id="ac-1_prm_3">
             <value>[specify frequency]</value>
          </set-parameter>
-         <statement statement-id="ac-1_stmt.a" uuid="fb4d039a-dc4f-46f5-9c1f-f6343eaf69bc">
+         <statement statement-id="ac-1_smt.a" uuid="fb4d039a-dc4f-46f5-9c1f-f6343eaf69bc">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="3f5612a4-cd1d-4c47-8cae-75d2eaa332cd">
                <description>
@@ -1038,21 +1038,21 @@
                <p>Any control implementation response that can not be associated with another component is associated with the component representing the system.</p>
             </remarks>
          </statement>
-         <statement statement-id="ac-1_stmt.a.1"
+         <statement statement-id="ac-1_smt.a.1"
                     uuid="0afdccce-b5ed-4127-ae19-cfbdd17d775e">
             <link href="#090ab379-2089-4830-b9fd-26d0729e22e9" rel="policy"/>
             <remarks>
                <p>This identifies a policy (attached in resources) that satisfies this control.</p>
             </remarks>
          </statement>
-         <statement statement-id="ac-1_stmt.a.2"
+         <statement statement-id="ac-1_smt.a.2"
                     uuid="ffaf5e02-3055-40df-bbeb-3b94e834a43f">
             <link href="#att-process-1" rel="process"/>
             <remarks>
                <p>This identifies a process (attached in resources) that satisfies this control.</p>
             </remarks>
          </statement>
-         <statement statement-id="ac-1_stmt.b.1"
+         <statement statement-id="ac-1_smt.b.1"
                     uuid="b46f97ec-55c1-4249-a9b9-3a228f1e3791">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="767666cb-e558-484b-81ca-b0209932425c">
@@ -1061,7 +1061,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ac-1_stmt.b.2"
+         <statement statement-id="ac-1_smt.b.2"
                     uuid="59c67969-3d5c-45f1-8e3e-1e642249633f">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="5a869308-1625-4d92-9ed8-ff5d8bd13656">
@@ -1113,7 +1113,7 @@
          </set-parameter>
          <responsible-role role-id="admin-unix"/>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ac-2_stmt.a" uuid="24a85abb-25ad-4686-850c-5c0e8ab69a0c">
+         <statement statement-id="ac-2_smt.a" uuid="24a85abb-25ad-4686-850c-5c0e8ab69a0c">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="b29d1505-69fa-4ad0-834b-d179e7f44f98">
                <description>
@@ -1181,7 +1181,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="at-1_stmt.a" uuid="ee5a11fb-9bae-4680-8f8c-575c85d47355">
+         <statement statement-id="at-1_smt.a" uuid="ee5a11fb-9bae-4680-8f8c-575c85d47355">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="58723d03-3e67-405a-873a-c7a981f50694">
                <description>
@@ -1195,21 +1195,21 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="at-1_stmt.a.1"
+         <statement statement-id="at-1_smt.a.1"
                     uuid="2e8ec7ce-c9c6-4f5f-9d50-3a3b9d3acf65">
             <link href="#090ab379-2089-4830-b9fd-26d0729e22e9" rel="policy"/>
             <remarks>
                <p>This identifies a policy (attached in resources) that satisfies this control.</p>
             </remarks>
          </statement>
-         <statement statement-id="at-1_stmt.a.2"
+         <statement statement-id="at-1_smt.a.2"
                     uuid="e7f9b618-c092-4b8b-b416-0ee477026726">
             <link href="#att-process-1" rel="process"/>
             <remarks>
                <p>This identifies a process (attached in resources) that satisfies this control.</p>
             </remarks>
          </statement>
-         <statement statement-id="at-1_stmt.b.1"
+         <statement statement-id="at-1_smt.b.1"
                     uuid="29192f0b-edb1-4820-b951-65ffdc64bb3e">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="8ba4eb22-f488-47aa-ba00-82b5359e41cd">
@@ -1224,7 +1224,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="at-1_stmt.b.2"
+         <statement statement-id="at-1_smt.b.2"
                     uuid="23a9bfa7-6e3f-4e00-a120-791b26a9157e">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="4de61567-7a1a-4ab9-be31-d88603c455c1">
@@ -1260,7 +1260,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="au-1_stmt.a" uuid="9a2bd937-226e-4aaf-8261-2cf0c2e3aa10">
+         <statement statement-id="au-1_smt.a" uuid="9a2bd937-226e-4aaf-8261-2cf0c2e3aa10">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="8831ffc2-6ec9-43c3-8249-a9113d018e25">
                <description>
@@ -1275,7 +1275,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="au-1_stmt.b.1"
+         <statement statement-id="au-1_smt.b.1"
                     uuid="d01f186f-a14f-4e22-b069-84a55e48a112">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="cfd7f36f-1cfc-4728-9412-4e3c4ab6cafa">
@@ -1291,7 +1291,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="au-1_stmt.b.2"
+         <statement statement-id="au-1_smt.b.2"
                     uuid="ea153acb-2bd0-41d9-8ebd-ba022d31230a">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="282fc353-4a4a-4d64-9e9f-e3662eee078f">
@@ -1328,7 +1328,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ca-1_stmt.a" uuid="e7bd0a7e-5f92-4769-8cd3-76ad2f663a5c">
+         <statement statement-id="ca-1_smt.a" uuid="e7bd0a7e-5f92-4769-8cd3-76ad2f663a5c">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="b95e1cc2-df46-400c-8ef8-d0e241e5ed35">
                <description>
@@ -1343,7 +1343,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ca-1_stmt.b.1"
+         <statement statement-id="ca-1_smt.b.1"
                     uuid="b2c3ec86-b976-4e5a-9dc3-4ac2d570765e">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="726faa4c-e7b4-4c83-8c0d-935fcc128b0c">
@@ -1359,7 +1359,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ca-1_stmt.b.2"
+         <statement statement-id="ca-1_smt.b.2"
                     uuid="e9474eb8-36d6-4eab-abeb-f9bd17e66b22">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="1f5ddb4d-1011-4002-8156-f007790fb377">
@@ -1395,7 +1395,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="cm-1_stmt.a" uuid="52339583-19b6-4774-9213-50b9f42fe51f">
+         <statement statement-id="cm-1_smt.a" uuid="52339583-19b6-4774-9213-50b9f42fe51f">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="3039cac6-2916-4083-ac4b-dd86ecf3f007">
                <description>
@@ -1410,7 +1410,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="cm-1_stmt.b.1"
+         <statement statement-id="cm-1_smt.b.1"
                     uuid="f9cc6f3f-c64f-4fae-9a32-f964ebdc8e74">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="8f7f54d1-5d11-4db7-9ac9-06e5cdfcb794">
@@ -1426,7 +1426,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="cm-1_stmt.b.2"
+         <statement statement-id="cm-1_smt.b.2"
                     uuid="c548a71f-41d6-4e8c-b400-1764379348c4">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="73ac1451-8481-4815-aacf-ba1b23c68127">
@@ -1462,7 +1462,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="cp-1_stmt.a" uuid="8bde1fa5-eb81-4a1b-9e6e-5827e176025a">
+         <statement statement-id="cp-1_smt.a" uuid="8bde1fa5-eb81-4a1b-9e6e-5827e176025a">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="3212dd32-9317-456c-84d3-fcb02f87fa8d">
                <description>
@@ -1477,7 +1477,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="cp-1_stmt.b.1"
+         <statement statement-id="cp-1_smt.b.1"
                     uuid="2fc9eec1-a49f-4cfa-9f7b-c702a1e21619">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="676faac0-691f-4a9d-b9c2-d556d9ac64a6">
@@ -1493,7 +1493,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="cp-1_stmt.b.2"
+         <statement statement-id="cp-1_smt.b.2"
                     uuid="db5b3977-bd51-4505-b3e2-1597bbd4d930">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="fe08e1ae-11ae-44ec-88e1-8fb0408961c8">
@@ -1529,7 +1529,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ia-1_stmt.a" uuid="ba92e479-705f-47a4-a763-dfc098ba239d">
+         <statement statement-id="ia-1_smt.a" uuid="ba92e479-705f-47a4-a763-dfc098ba239d">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="ccbb8ca9-f8af-472a-b623-6c10ef723583">
                <description>
@@ -1544,7 +1544,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ia-1_stmt.b.1"
+         <statement statement-id="ia-1_smt.b.1"
                     uuid="dba8c469-5758-497e-9856-e472a2e08677">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="d6cbe350-a930-45b5-8047-205438957b0d">
@@ -1560,7 +1560,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ia-1_stmt.b.2"
+         <statement statement-id="ia-1_smt.b.2"
                     uuid="b56e37b1-1f4c-479b-bfa1-a2773c2eebfd">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="b570dd23-0683-4355-9327-28fc476a1060">
@@ -1597,7 +1597,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ir-1_stmt.a" uuid="7284efc2-d953-486c-ab8a-3caef6ce06c3">
+         <statement statement-id="ir-1_smt.a" uuid="7284efc2-d953-486c-ab8a-3caef6ce06c3">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="ae794bb4-443e-4805-a503-a451d9cbdebc">
                <description>
@@ -1612,7 +1612,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ir-1_stmt.b.1"
+         <statement statement-id="ir-1_smt.b.1"
                     uuid="75c37e1a-6e8d-4ef0-99f4-c16f7995706c">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="c889e633-f797-41d4-9128-eb587c788158">
@@ -1628,7 +1628,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ir-1_stmt.b.2"
+         <statement statement-id="ir-1_smt.b.2"
                     uuid="900591ec-2006-4622-bc87-59828d884d4f">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="662f7cdb-c101-404e-943b-cde01d74d726">
@@ -1665,7 +1665,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ma-1_stmt.a" uuid="d609e538-3976-418e-a368-58fc75cd03c0">
+         <statement statement-id="ma-1_smt.a" uuid="d609e538-3976-418e-a368-58fc75cd03c0">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="9e752c89-6ff7-4966-a895-120763aff59d">
                <description>
@@ -1680,7 +1680,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ma-1_stmt.b.1"
+         <statement statement-id="ma-1_smt.b.1"
                     uuid="df1a6dd8-9e18-4408-8783-cb30e0413f22">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="1ad0212e-ff97-4da3-b97e-71554eceab87">
@@ -1696,7 +1696,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ma-1_stmt.b.2"
+         <statement statement-id="ma-1_smt.b.2"
                     uuid="f02f759d-7d4c-41f2-b153-f3cc1e157e39">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="eb3206a7-3e23-42c7-a665-281cbfea1b56">
@@ -1733,7 +1733,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="mp-1_stmt.a" uuid="bab45ad3-65ee-43bc-9c3e-c3e4e2db8001">
+         <statement statement-id="mp-1_smt.a" uuid="bab45ad3-65ee-43bc-9c3e-c3e4e2db8001">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="875ad3a0-2cef-4e41-8684-f5ac148d2fcc">
                <description>
@@ -1748,7 +1748,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="mp-1_stmt.b.1"
+         <statement statement-id="mp-1_smt.b.1"
                     uuid="ca35d4a5-ca73-4b3a-aa66-6c712c7a4a49">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="4e3f8ed5-1bb6-496b-9516-979e9b646c7c">
@@ -1764,7 +1764,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="mp-1_stmt.b.2"
+         <statement statement-id="mp-1_smt.b.2"
                     uuid="0c5c6eda-9644-46f2-a29c-16fe4e248621">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="85a528a8-5680-4307-afc5-b3574f1528af">
@@ -1800,7 +1800,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="pe-1_stmt.a" uuid="11fd3e46-4735-4986-91bc-747345fe608a">
+         <statement statement-id="pe-1_smt.a" uuid="11fd3e46-4735-4986-91bc-747345fe608a">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="b20f54cc-918c-4ca2-9041-032068b8b135">
                <description>
@@ -1815,7 +1815,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="pe-1_stmt.b.1"
+         <statement statement-id="pe-1_smt.b.1"
                     uuid="a37f91e2-190d-40f7-829c-39776c14c8b4">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="e1b7884e-ea41-4ea3-af35-3e08bf05ef12">
@@ -1831,7 +1831,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="pe-1_stmt.b.2"
+         <statement statement-id="pe-1_smt.b.2"
                     uuid="f3d57138-916c-4064-b2fc-aa8dd76849f8">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="fc60aa6d-9784-4536-a11a-364d365ef78c">
@@ -1867,7 +1867,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="pl-1_stmt.a" uuid="ec7af577-ff22-46bf-ac0a-cf9d75c72ebb">
+         <statement statement-id="pl-1_smt.a" uuid="ec7af577-ff22-46bf-ac0a-cf9d75c72ebb">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="c7c8cf7a-0c77-4084-bcde-3947f08bfb45">
                <description>
@@ -1882,7 +1882,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="pl-1_stmt.b.1"
+         <statement statement-id="pl-1_smt.b.1"
                     uuid="438f3e29-670a-49f2-8b9f-05d951318294">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="78b5c057-f6bb-4f3e-ba4c-88b6aa23975c">
@@ -1898,7 +1898,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="pl-1_stmt.b.2"
+         <statement statement-id="pl-1_smt.b.2"
                     uuid="96a4d13c-bd2b-4038-96c5-0f923f404bbd">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="415b438d-d6b7-46ce-b344-acd76d693a4f">
@@ -1935,7 +1935,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ps-1_stmt.a" uuid="afe1703d-5e59-460b-b048-41b49699c5a1">
+         <statement statement-id="ps-1_smt.a" uuid="afe1703d-5e59-460b-b048-41b49699c5a1">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="7d3a23fe-0116-4760-972a-19d3e9559420">
                <description>
@@ -1950,7 +1950,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ps-1_stmt.b.1"
+         <statement statement-id="ps-1_smt.b.1"
                     uuid="956c93e2-cf8f-482c-aaf7-91ab44c7cbd6">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="567313a8-3484-4c06-89ee-769f3a92820b">
@@ -1966,7 +1966,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ps-1_stmt.b.2"
+         <statement statement-id="ps-1_smt.b.2"
                     uuid="6926c688-3fb2-4ab8-9acb-cff0b5acd365">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="c31fcbec-2ad9-464e-b574-417dcb07e20f">
@@ -2002,7 +2002,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="ra-1_stmt.a" uuid="8fe541ea-0920-42d0-8561-4e08f04d796c">
+         <statement statement-id="ra-1_smt.a" uuid="8fe541ea-0920-42d0-8561-4e08f04d796c">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="5a52e7a2-28cb-46bf-900a-fafd8a99528f">
                <description>
@@ -2017,7 +2017,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ra-1_stmt.b.1"
+         <statement statement-id="ra-1_smt.b.1"
                     uuid="b0e9ed47-fe83-485d-8d79-979833543a83">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="d1c211c2-6507-4f4c-99d5-cc644f2febec">
@@ -2033,7 +2033,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="ra-1_stmt.b.2"
+         <statement statement-id="ra-1_smt.b.2"
                     uuid="d9a38f95-ded1-4d1d-afe2-242987222ebd">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="cc54cd5d-0d97-41d8-b0f4-dd36bc4c76fa">
@@ -2069,7 +2069,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="sa-1_stmt.a" uuid="ae3f64be-2e62-4347-b06a-727bc28e4f9b">
+         <statement statement-id="sa-1_smt.a" uuid="ae3f64be-2e62-4347-b06a-727bc28e4f9b">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="61352cd9-6409-45e4-9e19-a0cf8b366746">
                <description>
@@ -2084,7 +2084,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="sa-1_stmt.b.1"
+         <statement statement-id="sa-1_smt.b.1"
                     uuid="959519a9-3e12-47bc-8d76-50d9ab0b6544">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="46271e91-ecf3-4bdf-8a0e-3ad6aaea6aa9">
@@ -2100,7 +2100,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="sa-1_stmt.b.2"
+         <statement statement-id="sa-1_smt.b.2"
                     uuid="9daa3848-9672-469c-9aa0-f363e3339123">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="c702c9f9-da77-456f-9c7a-5aa439f0e3a8">
@@ -2136,7 +2136,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="sc-1_stmt.a" uuid="5e2e8372-c13b-4cf5-90c5-e8833a9fe241">
+         <statement statement-id="sc-1_smt.a" uuid="5e2e8372-c13b-4cf5-90c5-e8833a9fe241">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="1d4a8281-f8f3-4ddb-ae72-95c3b5ca304f">
                <description>
@@ -2151,7 +2151,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="sc-1_stmt.b.1"
+         <statement statement-id="sc-1_smt.b.1"
                     uuid="8166980a-86c0-497d-87e4-453adfd0d4bd">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="7fe23f15-fd8d-4b92-bf4c-73712e216749">
@@ -2167,7 +2167,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="sc-1_stmt.b.2"
+         <statement statement-id="sc-1_smt.b.2"
                     uuid="eeea34ff-18ab-4c35-bf32-c74dbf746e7b">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="2be47ef4-0e76-4d0c-95a2-9f578d16abc9">
@@ -2203,7 +2203,7 @@
             <value>[specify frequency]</value>
          </set-parameter>
          <responsible-role role-id="program-director"/>
-         <statement statement-id="si-1_stmt.a" uuid="915b10d2-2275-4d86-951a-eec23f9ee77a">
+         <statement statement-id="si-1_smt.a" uuid="915b10d2-2275-4d86-951a-eec23f9ee77a">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="97a24f3a-39e3-45b4-b457-42ffe6dcfdf2">
                <description>
@@ -2218,7 +2218,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="si-1_stmt.b.1"
+         <statement statement-id="si-1_smt.b.1"
                     uuid="2a5a6f7f-aeea-4ea4-be1e-859df4bf7521">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="adfe8c0d-678a-491e-a22e-7601d4a7ec5f">
@@ -2234,7 +2234,7 @@
                </description>
             </by-component>
          </statement>
-         <statement statement-id="si-1_stmt.b.2"
+         <statement statement-id="si-1_smt.b.2"
                     uuid="c152bbde-57fc-4864-ac51-861bd8bb83b4">
             <by-component component-uuid="60f92bcf-f353-4236-9803-2a5d417555f4"
                           uuid="b9c2449f-46d5-49c4-8780-496f748e2d26">