diff --git a/src/validations/constraints/content/ssp-all-VALID.xml b/src/validations/constraints/content/ssp-all-VALID.xml
index 5e3fb0a43..c863c150f 100644
--- a/src/validations/constraints/content/ssp-all-VALID.xml
+++ b/src/validations/constraints/content/ssp-all-VALID.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     <prop name="marking" value="cui"/>
     <role id="authorizing-official">
       <title>Authorizing Official</title>
@@ -178,11 +178,11 @@
         <p>Remarks are required if service model is "other". Optional otherwise.</p>
       </remarks>
     </prop>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
-    <prop ns="https://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023-01-01+00:00"/>
+    <prop ns="http://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023-01-01+00:00"/>
     <security-sensitivity-level>fips-199-moderate</security-sensitivity-level>
     <system-information>
       <information-type  uuid="33333333-0000-4000-9000-000000000003">
@@ -262,9 +262,9 @@
 
     <leveraged-authorization uuid="233e0f09-fe5e-47e2-bca3-5f32df75e57a">
       <title>GovCloud</title>
-      <prop ns="https://fedramp.gov/ns/oscal" name="leveraged-system-identifier" value="F1603047866"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authorization-type" value="fedramp-agency"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="impact-level" value="moderate"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="leveraged-system-identifier" value="F1603047866"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="authorization-type" value="fedramp-agency"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="impact-level" value="moderate"/>
       <link href="//path/to/leveraged_system_ssp.xml"/>
       <party-uuid>f0bc13a4-3303-47dd-80d3-380e159c8362</party-uuid>
       <date-authorized>2015-01-01</date-authorized>
@@ -277,8 +277,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -308,8 +308,8 @@
         <p>An external leveraged system.</p>
       </description>
       <prop name="leveraged-authorization-uuid" value="233e0f09-fe5e-47e2-bca3-5f32df75e57a"/>
-      <prop name="nature-of-agreement" ns="https://fedramp.gov/ns/oscal" value="sla"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="yes"/>
+      <prop name="nature-of-agreement" ns="http://fedramp.gov/ns/oscal" value="sla"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="yes"/>
      <status state="operational"/>
      </component>
 
@@ -318,9 +318,9 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="yes">
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="yes">
         <remarks>
           <p>Some description of the authentication method.</p>
         </remarks>
@@ -340,8 +340,8 @@
           <p>Briefly describe the external system.</p>
       </description>
       <prop name="asset-type" value="cli"/>
-      <prop name="direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="nature-of-agreement" ns="https://fedramp.gov/ns/oscal" value="isa"/>
+      <prop name="direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="nature-of-agreement" ns="http://fedramp.gov/ns/oscal" value="isa"/>
       <status state="operational"/>
     </component>
     
@@ -372,7 +372,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
diff --git a/src/validations/constraints/content/ssp-authentication-method-has-remarks-INVALID.xml b/src/validations/constraints/content/ssp-authentication-method-has-remarks-INVALID.xml
index 06b7b625d..678aa18b8 100644
--- a/src/validations/constraints/content/ssp-authentication-method-has-remarks-INVALID.xml
+++ b/src/validations/constraints/content/ssp-authentication-method-has-remarks-INVALID.xml
@@ -1,7 +1,7 @@
 <system-security-plan xmlns="http://csrc.nist.gov/ns/oscal/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="12345678-1234-4321-8765-123456789012">
   <system-implementation>
     <component uuid="66666666-0000-4000-9000-000000000006" type="interconnection">
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="yes">
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="yes">
         <!-- <remarks>
           <p>Some description of the authentication method.</p>
         </remarks> Missing remarks field. Authentication method count = 1 and remarks count = 0.-->
diff --git a/src/validations/constraints/content/ssp-component-has-authentication-method-INVALID.xml b/src/validations/constraints/content/ssp-component-has-authentication-method-INVALID.xml
index 41bba60e6..76c638f63 100644
--- a/src/validations/constraints/content/ssp-component-has-authentication-method-INVALID.xml
+++ b/src/validations/constraints/content/ssp-component-has-authentication-method-INVALID.xml
@@ -7,8 +7,8 @@
     <component uuid="11111111-2222-4000-8000-009000100001" type="system">
       <prop name="leveraged-authorization-uuid" value="11111111-2222-4000-8000-019000000001"/>
       <prop name="implementation-point" value="external"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="nature-of-agreement" value="sla"/>
-      <!-- <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
+      <prop ns="http://fedramp.gov/ns/oscal" name="nature-of-agreement" value="sla"/>
+      <!-- <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
         <remarks>
           <p>If 'yes', describe the authentication method.</p>
           <p>If 'no', explain why no authentication is used.</p>
@@ -19,8 +19,8 @@
     <component uuid="11111111-2222-4000-8000-009000500002" type="service">
       <prop name="implementation-point" value="external"/>
       <prop name="direction" value="outgoing"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
-      <!-- <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
+      <prop ns="http://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
+      <!-- <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
         <remarks>
           <p>If 'yes', describe the authentication method.</p>
           <p>If 'no', explain why no authentication is used.</p>
@@ -31,9 +31,9 @@
     <component uuid="11111111-2222-4000-8000-009000200001" type="interconnection">
       <prop name="direction" value="incoming"/>
       <prop name="direction" value="outgoing"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="nature-of-agreement" value="contract"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
-      <!-- <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
+      <prop ns="http://fedramp.gov/ns/oscal" name="nature-of-agreement" value="contract"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
+      <!-- <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
         <remarks>
           <p>If 'yes', describe the authentication method in the remarks.</p>
           <p>If 'no', explain why no authentication is used in the remarks.</p>
@@ -44,7 +44,7 @@
     <component uuid="11111111-2222-4000-8000-009000500004" type="service">
         <prop name="implementation-point" value="internal"/>
         <prop name="direction" value="outgoing"/>
-        <!-- <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
+        <!-- <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
           <remarks>
             <p>If 'yes', describe the authentication method in the remarks.</p>
             <p>If 'no', explain why no authentication is used in the remarks.</p>
@@ -56,7 +56,7 @@
       <prop name="asset-type" value="cli"/>
       <prop name="implementation-point" value="internal"/>
       <prop name="direction" value="outgoing"/>
-      <!-- <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
+      <!-- <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID"> Missing authentication-method
         <remarks>
           <p>If 'yes', describe the authentication method in the remarks.</p>
           <p>If 'no', explain why no authentication is used in the remarks.</p>
diff --git a/src/validations/constraints/content/ssp-external-system-nature-of-agreement-INVALID.xml b/src/validations/constraints/content/ssp-external-system-nature-of-agreement-INVALID.xml
index a5ebfb095..00197389b 100644
--- a/src/validations/constraints/content/ssp-external-system-nature-of-agreement-INVALID.xml
+++ b/src/validations/constraints/content/ssp-external-system-nature-of-agreement-INVALID.xml
@@ -12,8 +12,8 @@
           <p>Briefly describe the external system.</p>
       </description>
       <prop name="asset-type" value="cli"/>
-      <prop name="direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="nature-of-agreement" ns="https://fedramp.gov/ns/oscal" value="invalid"/>
+      <prop name="direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="nature-of-agreement" ns="http://fedramp.gov/ns/oscal" value="invalid"/>
       <status state="operational"/>
     </component>
 
diff --git a/src/validations/constraints/content/ssp-fully-operational-date-is-valid-INVALID.xml b/src/validations/constraints/content/ssp-fully-operational-date-is-valid-INVALID.xml
index ee8d35770..2c8343fde 100644
--- a/src/validations/constraints/content/ssp-fully-operational-date-is-valid-INVALID.xml
+++ b/src/validations/constraints/content/ssp-fully-operational-date-is-valid-INVALID.xml
@@ -5,7 +5,7 @@
                       uuid="12345678-1234-4321-8765-123456789012">
   
   <system-characteristics>
-    <prop ns="https://fedramp.gov/ns/oscal" name="fully-operational-date" value="2027-01-01+00:00"/><!-- operational date should not be in future -->
+    <prop ns="http://fedramp.gov/ns/oscal" name="fully-operational-date" value="2027-01-01+00:00"/><!-- operational date should not be in future -->
   </system-characteristics>
 
 </system-security-plan>
diff --git a/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-1.xml b/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-1.xml
index 9777a0709..903819fa8 100644
--- a/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-1.xml
+++ b/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-1.xml
@@ -5,7 +5,7 @@
                       uuid="12345678-1234-4321-8765-123456789012">
   
   <system-characteristics>
-    <prop ns="https://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023"/><!-- year only instead of full date -->
+    <prop ns="http://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023"/><!-- year only instead of full date -->
   </system-characteristics>
 
 </system-security-plan>
\ No newline at end of file
diff --git a/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-2.xml b/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-2.xml
index f56852859..d3dda7a06 100644
--- a/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-2.xml
+++ b/src/validations/constraints/content/ssp-fully-operational-date-type-INVALID-2.xml
@@ -5,7 +5,7 @@
                       uuid="12345678-1234-4321-8765-123456789012">
   
   <system-characteristics>
-    <prop ns="https://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023-01-01"/><!-- no timezone -->
+    <prop ns="http://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023-01-01"/><!-- no timezone -->
   </system-characteristics>
 
 </system-security-plan>
\ No newline at end of file
diff --git a/src/validations/constraints/content/ssp-has-authorization-boundary-diagram-link-href-target-VALID-1.xml b/src/validations/constraints/content/ssp-has-authorization-boundary-diagram-link-href-target-VALID-1.xml
index f2df4e7d7..ca7e9261a 100644
--- a/src/validations/constraints/content/ssp-has-authorization-boundary-diagram-link-href-target-VALID-1.xml
+++ b/src/validations/constraints/content/ssp-has-authorization-boundary-diagram-link-href-target-VALID-1.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="creator">
       <title>Document Creator</title>
@@ -112,15 +112,15 @@
   <import-profile href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <system-name-short>System's Short Name or Acronym</system-name-short>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -203,8 +203,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -234,8 +234,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -254,7 +254,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -269,15 +269,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -285,14 +285,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -306,7 +306,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -387,7 +387,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -403,7 +403,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -418,7 +418,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -433,7 +433,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-has-data-flow-diagram-link-href-target-VALID-1.xml b/src/validations/constraints/content/ssp-has-data-flow-diagram-link-href-target-VALID-1.xml
index e747c4e5d..53dc29acd 100644
--- a/src/validations/constraints/content/ssp-has-data-flow-diagram-link-href-target-VALID-1.xml
+++ b/src/validations/constraints/content/ssp-has-data-flow-diagram-link-href-target-VALID-1.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="creator">
       <title>Document Creator</title>
@@ -112,15 +112,15 @@
   <import-profile href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <system-name-short>System's Short Name or Acronym</system-name-short>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -203,8 +203,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -234,8 +234,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -254,7 +254,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -269,15 +269,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -285,14 +285,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -306,7 +306,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -387,7 +387,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -403,7 +403,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -418,7 +418,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -433,7 +433,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-has-inventory-items-INVALID.xml b/src/validations/constraints/content/ssp-has-inventory-items-INVALID.xml
index e395ad924..ae3e4e5ac 100644
--- a/src/validations/constraints/content/ssp-has-inventory-items-INVALID.xml
+++ b/src/validations/constraints/content/ssp-has-inventory-items-INVALID.xml
@@ -14,7 +14,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
diff --git a/src/validations/constraints/content/ssp-has-network-architecture-diagram-link-href-target-VALID-1.xml b/src/validations/constraints/content/ssp-has-network-architecture-diagram-link-href-target-VALID-1.xml
index 4b144a341..d156da919 100644
--- a/src/validations/constraints/content/ssp-has-network-architecture-diagram-link-href-target-VALID-1.xml
+++ b/src/validations/constraints/content/ssp-has-network-architecture-diagram-link-href-target-VALID-1.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="creator">
       <title>Document Creator</title>
@@ -112,15 +112,15 @@
   <import-profile href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <system-name-short>System's Short Name or Acronym</system-name-short>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -203,8 +203,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -234,8 +234,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -254,7 +254,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -269,15 +269,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -285,14 +285,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -306,7 +306,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -387,7 +387,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -403,7 +403,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -418,7 +418,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -433,7 +433,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-1.xml b/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-1.xml
index fcf746648..b92975e69 100644
--- a/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-1.xml
+++ b/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-1.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="creator">
       <title>Document Creator</title>
@@ -71,14 +71,14 @@
   <import-profile href="../../../../src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -175,8 +175,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -195,7 +195,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -210,15 +210,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -226,14 +226,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -247,7 +247,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -328,7 +328,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -344,7 +344,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -359,7 +359,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -374,7 +374,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-2.xml b/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-2.xml
index c423b81e2..01968f3f0 100644
--- a/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-2.xml
+++ b/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-2.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="creator">
       <title>Document Creator</title>
@@ -71,14 +71,14 @@
   <import-profile href="#eeeeeeee-0000-4000-9000-0000000000ee"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -175,8 +175,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -195,7 +195,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -210,15 +210,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -226,14 +226,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -247,7 +247,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="eeeeeeee-0000-4000-9000-0000000000ee">
@@ -255,7 +255,7 @@
       <description>
         <p>Profile to be imported</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -336,7 +336,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -352,7 +352,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -367,7 +367,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -382,7 +382,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-3.xml b/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-3.xml
index b658e6310..0a95e778f 100644
--- a/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-3.xml
+++ b/src/validations/constraints/content/ssp-import-profile-resolves-to-fedramp-content-VALID-3.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="creator">
       <title>Document Creator</title>
@@ -71,14 +71,14 @@
   <import-profile href="#eeeeeeee-0000-4000-9000-0000000000ee"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -175,8 +175,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -195,7 +195,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -210,15 +210,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -226,14 +226,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -247,7 +247,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="eeeeeeee-0000-4000-9000-0000000000ee">
@@ -255,7 +255,7 @@
       <description>
         <p>Profile to be imported</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="../../../../src/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline_profile.xml"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -336,7 +336,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -352,7 +352,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -367,7 +367,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -382,7 +382,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-leveraged-authorization-nature-of-agreement-INVALID.xml b/src/validations/constraints/content/ssp-leveraged-authorization-nature-of-agreement-INVALID.xml
index 560d3183d..96ce1e1a3 100644
--- a/src/validations/constraints/content/ssp-leveraged-authorization-nature-of-agreement-INVALID.xml
+++ b/src/validations/constraints/content/ssp-leveraged-authorization-nature-of-agreement-INVALID.xml
@@ -11,7 +11,7 @@
         <p>An external leveraged system.</p>
       </description>
       <prop name="leveraged-authorization-uuid" uuid="233e0f09-fe5e-47e2-bca3-5f32df75e57a" value="contract"/>
-      <prop name="nature-of-agreement" uuid="306e68da-86c3-4c18-b559-e95d85fb71e7" ns="https://fedramp.gov/ns/oscal" value="invalid"/>
+      <prop name="nature-of-agreement" uuid="306e68da-86c3-4c18-b559-e95d85fb71e7" ns="http://fedramp.gov/ns/oscal" value="invalid"/>
       <status state="operational"/>
     </component>
   </system-implementation>
diff --git a/src/validations/constraints/content/ssp-privilege-level-INVALID.xml b/src/validations/constraints/content/ssp-privilege-level-INVALID.xml
index dcd963ded..84120558b 100644
--- a/src/validations/constraints/content/ssp-privilege-level-INVALID.xml
+++ b/src/validations/constraints/content/ssp-privilege-level-INVALID.xml
@@ -5,7 +5,7 @@
                       uuid="12345678-1234-4321-8765-123456789012">
   <system-implementation>
     <user uuid="44444444-0000-4000-9000-000000000004">
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="unsupported-access-type"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="unsupported-access-type"/>
     </user>
   </system-implementation>
 </system-security-plan>
\ No newline at end of file
diff --git a/src/validations/constraints/content/ssp-responsible-party-is-person-INVALID.xml b/src/validations/constraints/content/ssp-responsible-party-is-person-INVALID.xml
index 321c778df..77558dca9 100644
--- a/src/validations/constraints/content/ssp-responsible-party-is-person-INVALID.xml
+++ b/src/validations/constraints/content/ssp-responsible-party-is-person-INVALID.xml
@@ -45,7 +45,7 @@
             <address >
             <country>US</country>
             </address>
-            <prop name='data-center' value='dc-zone-1' class='tertiary' ns="https://fedramp.gov/ns/oscal"/>
+            <prop name='data-center' value='dc-zone-1' class='tertiary' ns="http://fedramp.gov/ns/oscal"/>
         </location>
         <party uuid="11111111-0000-4000-9000-000000000001" type="organization">
             <name>Example Organization</name>
diff --git a/src/validations/constraints/content/ssp-responsible-party-prepared-by-location-valid-VALID-1.xml b/src/validations/constraints/content/ssp-responsible-party-prepared-by-location-valid-VALID-1.xml
index deffeb3d5..62280758a 100644
--- a/src/validations/constraints/content/ssp-responsible-party-prepared-by-location-valid-VALID-1.xml
+++ b/src/validations/constraints/content/ssp-responsible-party-prepared-by-location-valid-VALID-1.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     
     <role id="prepared-by">
       <title>Prepared By</title>
@@ -136,15 +136,15 @@
   <import-profile href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <system-name-short>System's Short Name or Acronym</system-name-short>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -227,8 +227,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -258,8 +258,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -278,7 +278,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -293,15 +293,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -309,14 +309,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -330,7 +330,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -411,7 +411,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -427,7 +427,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -442,7 +442,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -457,7 +457,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-responsible-party-prepared-for-location-valid-VALID-1.xml b/src/validations/constraints/content/ssp-responsible-party-prepared-for-location-valid-VALID-1.xml
index 2cbfddbc6..331191dfe 100644
--- a/src/validations/constraints/content/ssp-responsible-party-prepared-for-location-valid-VALID-1.xml
+++ b/src/validations/constraints/content/ssp-responsible-party-prepared-for-location-valid-VALID-1.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     <role id="prepared-for">
       <title>Prepared For</title>
       <description>
@@ -132,15 +132,15 @@
   <import-profile href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <system-name-short>System's Short Name or Acronym</system-name-short>
     <description>
       <p>This is an enhanced example system for demonstration purposes, incorporating more FedRAMP-specific elements.</p>
     </description>
-    <prop name='cloud-deployment-model' value='government-only-cloud' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='cloud-service-model' value='other' ns="https://fedramp.gov/ns/oscal"/>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-deployment-model' value='government-only-cloud' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='cloud-service-model' value='other' ns="http://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
@@ -223,8 +223,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -254,8 +254,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -274,7 +274,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -289,15 +289,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -305,14 +305,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -326,7 +326,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -407,7 +407,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -423,7 +423,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -438,7 +438,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -453,7 +453,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-saas-has-leveraged-authorization-VALID.xml b/src/validations/constraints/content/ssp-saas-has-leveraged-authorization-VALID.xml
index d501f09d9..d94c243f3 100644
--- a/src/validations/constraints/content/ssp-saas-has-leveraged-authorization-VALID.xml
+++ b/src/validations/constraints/content/ssp-saas-has-leveraged-authorization-VALID.xml
@@ -10,7 +10,7 @@
     <version>1.1</version>
     <oscal-version>1.1.2</oscal-version>
     <document-id scheme="https://example.com/identifiers">SSP-2024-002</document-id>
-    <prop name="fedramp-version" ns="https://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
+    <prop name="fedramp-version" ns="http://fedramp.gov/ns/oscal" value="fedramp-3.0.0rc1-oscal-1.1.2"/>
     <prop name="marking" value="cui"/>
     
     <role id="prepared-by">
@@ -157,7 +157,7 @@
   <import-profile href="../../../../dist/content/rev5/baselines/xml/FedRAMP_rev5_HIGH-baseline-resolved-profile_catalog.xml"/>
   
   <system-characteristics>
-    <system-id identifier-type="https://fedramp.gov">F00000001</system-id>
+    <system-id identifier-type="http://fedramp.gov/ns/oscal">F00000001</system-id>
     <system-name>Enhanced Example System</system-name>
     <system-name-short>System's Short Name or Acronym</system-name-short>
     <description>
@@ -173,11 +173,11 @@
         <p>Remarks are required if service model is "other". Optional otherwise.</p>
       </remarks>
     </prop>
-    <prop name='authorization-type' value='fedramp-agency' ns="https://fedramp.gov/ns/oscal"/>
+    <prop name='authorization-type' value='fedramp-agency' ns="http://fedramp.gov/ns/oscal"/>
     <prop name="identity-assurance-level" value="2"/>
     <prop name="authenticator-assurance-level" value="2"/>
     <prop name="federation-assurance-level" value="2"/>
-    <prop ns="https://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023-01-01+00:00"/>
+    <prop ns="http://fedramp.gov/ns/oscal" name="fully-operational-date" value="2023-01-01+00:00"/>
     <security-sensitivity-level>fips-199-moderate</security-sensitivity-level>
     <system-information>
       <information-type  uuid="33333333-0000-4000-9000-000000000003">
@@ -272,8 +272,8 @@
     <user uuid="44444444-0000-4000-9000-000000000004">
       <title>System Administrator</title>
       <prop name="type" value="internal"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="read-write"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="sensitivity" value="high-risk"/>
       <role-id>system-admin</role-id>
       <authorized-privilege>
         <title>Admin</title>
@@ -303,8 +303,8 @@
       <description>
         <p>Secure connection to an external API for data enrichment.</p>
       </description>
-      <prop name="interconnection-security" value="vpn" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="interconnection-direction" value="in/out" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-security" value="vpn" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="interconnection-direction" value="in/out" ns="http://fedramp.gov/ns/oscal"/>
       <status state="operational"/>
       <responsible-role role-id="system-admin">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
@@ -323,7 +323,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -341,7 +341,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -357,15 +357,15 @@
       <p>Implementation of controls for the Enhanced Example System</p>
     </description>
     <implemented-requirement uuid="88888888-0000-4000-9000-000000000008" control-id="ac-1">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
-      <prop name="implementation-status" value="partial" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
+      <prop name="implementation-status" value="partial" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="ac-1_stmt.a" uuid="99999999-0000-4000-9000-000000000009">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="aaaaaaaa-0000-4000-9000-00000000000a">
         <description>
           <p>Access Control Policy and Procedures (AC-1) is fully implemented in our system.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="implemented"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -373,14 +373,14 @@
     </implemented-requirement>
     
     <implemented-requirement uuid="bbbbbbbb-0000-4000-9000-00000000000b" control-id="cm-8">
-      <prop name="control-origination" value="sp-system" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="control-origination" value="sp-system" ns="http://fedramp.gov/ns/oscal"/>
       <statement statement-id="cm-8_stmt.a" uuid="cccccccc-0000-4000-9000-00000000000c">
       </statement>
       <by-component component-uuid="55555555-0000-4000-9000-000000000005" uuid="dddddddd-0000-4000-9000-00000000000d">
         <description>
           <p>Information System Component Inventory (CM-8) is partially implemented.</p>
         </description>
-        <prop ns="https://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
+        <prop ns="http://fedramp.gov/ns/oscal" name="implementation-status" value="partial"/>
         <responsible-role role-id="system-admin">
           <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
         </responsible-role>
@@ -394,7 +394,7 @@
       <description>
         <p>Detailed access control policy document</p>
       </description>
-      <prop name="type" value="policy" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="type" value="policy" ns="http://fedramp.gov/ns/oscal"/>
       <rlink href="https://example.com/policies/access-control.pdf"/>
     </resource>
     <resource uuid="90a128ac-c850-48f6-8fff-a55692f80b41">
@@ -475,7 +475,7 @@
   <description>
      <p>Separation of Duties Matrix</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="separation-of-duties-matrix"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Sep_Matrix.docx" media-type="application/msword"/>
@@ -491,7 +491,7 @@
   <description>
      <p>Authorization Boundary Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/AuthBoundary.docx" media-type="application/msword"/>
@@ -506,7 +506,7 @@
   <description>
      <p>Network Architecture Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/NetworkArchitecture.docx" media-type="application/msword"/>
@@ -521,7 +521,7 @@
   <description>
      <p>Data flow Diagram</p>
   </description>
-  <prop ns="https://fedramp.gov/ns/oscal" name="type" value="plan"/>
+  <prop ns="http://fedramp.gov/ns/oscal" name="type" value="plan"/>
   <prop name="published" value="2023-01-01T00:00:00Z"/>
   <prop name="version" value="Document Version"/>
   <rlink href="./documents/Dataflo.docx" media-type="application/msword"/>
diff --git a/src/validations/constraints/content/ssp-unique-inventory-item-asset-id-INVALID.xml b/src/validations/constraints/content/ssp-unique-inventory-item-asset-id-INVALID.xml
index 5460bc49d..06768b340 100644
--- a/src/validations/constraints/content/ssp-unique-inventory-item-asset-id-INVALID.xml
+++ b/src/validations/constraints/content/ssp-unique-inventory-item-asset-id-INVALID.xml
@@ -9,7 +9,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
@@ -26,7 +26,7 @@
       <prop name="allows-authenticated-scan" value="yes"/>
       <prop name="public" value="no"/>
       <prop name="virtual" value="yes"/>
-      <prop name="scan-type" value="database" ns="https://fedramp.gov/ns/oscal"/>
+      <prop name="scan-type" value="database" ns="http://fedramp.gov/ns/oscal"/>
       <responsible-party role-id="asset-owner">
         <party-uuid>11111111-0000-4000-9000-000000000001</party-uuid>
       </responsible-party>
diff --git a/src/validations/constraints/content/ssp-user-authentication-INVALID.xml b/src/validations/constraints/content/ssp-user-authentication-INVALID.xml
index 2f95792f2..beddedf80 100644
--- a/src/validations/constraints/content/ssp-user-authentication-INVALID.xml
+++ b/src/validations/constraints/content/ssp-user-authentication-INVALID.xml
@@ -7,8 +7,8 @@
     <component uuid="11111111-2222-4000-8000-009000100001" type="system">
       <prop name="leveraged-authorization-uuid" value="11111111-2222-4000-8000-019000000001"/>
       <prop name="implementation-point" value="external"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="nature-of-agreement" value="sla"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
+      <prop ns="http://fedramp.gov/ns/oscal" name="nature-of-agreement" value="sla"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
         <remarks>
           <p>If 'yes', describe the authentication method.</p>
           <p>If 'no', explain why no authentication is used.</p>
@@ -24,8 +24,8 @@
       </description>
       <prop name="implementation-point" value="external"/>
       <prop name="direction" value="outgoing"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
+      <prop ns="http://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
         <remarks>
           <p>If 'yes', describe the authentication method.</p>
           <p>If 'no', explain why no authentication is used.</p>
@@ -36,9 +36,9 @@
     <component uuid="11111111-2222-4000-8000-009000200001" type="interconnection">
       <prop name="direction" value="incoming"/>
       <prop name="direction" value="outgoing"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="nature-of-agreement" value="contract"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
+      <prop ns="http://fedramp.gov/ns/oscal" name="nature-of-agreement" value="contract"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="still-supported" value="yes"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
         <remarks>
           <p>If 'yes', describe the authentication method in the remarks.</p>
           <p>If 'no', explain why no authentication is used in the remarks.</p>
@@ -54,7 +54,7 @@
         </description>
         <prop name="implementation-point" value="internal"/>
         <prop name="direction" value="outgoing"/>
-        <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
+        <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
           <remarks>
             <p>If 'yes', describe the authentication method in the remarks.</p>
             <p>If 'no', explain why no authentication is used in the remarks.</p>
@@ -70,7 +70,7 @@
       <prop name="asset-type" value="cli"/>
       <prop name="implementation-point" value="internal"/>
       <prop name="direction" value="outgoing"/>
-      <prop ns="https://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
+      <prop ns="http://fedramp.gov/ns/oscal" name="authentication-method" value="INVALID">
         <remarks>
           <p>If 'yes', describe the authentication method in the remarks.</p>
           <p>If 'no', explain why no authentication is used in the remarks.</p>
diff --git a/src/validations/constraints/content/ssp-user-privilege-level-INVALID.xml b/src/validations/constraints/content/ssp-user-privilege-level-INVALID.xml
index 695e56111..d7b35a773 100644
--- a/src/validations/constraints/content/ssp-user-privilege-level-INVALID.xml
+++ b/src/validations/constraints/content/ssp-user-privilege-level-INVALID.xml
@@ -2,7 +2,7 @@
 <system-security-plan xmlns="http://csrc.nist.gov/ns/oscal/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="12345678-1234-4321-8765-123456789012">
   <system-implementation>
     <user uuid="44444444-0000-4000-9000-000000000004">
-      <prop ns="https://fedramp.gov/ns/oscal" name="privilege-level" value="invalid"/>
+      <prop ns="http://fedramp.gov/ns/oscal" name="privilege-level" value="invalid"/>
     </user>
   </system-implementation>
 </system-security-plan>
diff --git a/src/validations/constraints/content/ssp-user-sensitivity-level-INVALID.xml b/src/validations/constraints/content/ssp-user-sensitivity-level-INVALID.xml
index a1e2b8801..6332bfb15 100644
--- a/src/validations/constraints/content/ssp-user-sensitivity-level-INVALID.xml
+++ b/src/validations/constraints/content/ssp-user-sensitivity-level-INVALID.xml
@@ -2,7 +2,7 @@
 <system-security-plan xmlns="http://csrc.nist.gov/ns/oscal/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="12345678-1234-4321-8765-123456789012">
   <system-implementation>
     <user uuid="44444444-0000-4000-9000-000000000004">
-      <prop ns='https://fedramp.gov/ns/oscal' name="sensitivity" value="infinite-risk"/>
+      <prop ns='http://fedramp.gov/ns/oscal' name="sensitivity" value="infinite-risk"/>
     </user>
   </system-implementation>
 </system-security-plan>
diff --git a/src/validations/constraints/fedramp-external-allowed-values.xml b/src/validations/constraints/fedramp-external-allowed-values.xml
index c7978f24d..420014924 100644
--- a/src/validations/constraints/fedramp-external-allowed-values.xml
+++ b/src/validations/constraints/fedramp-external-allowed-values.xml
@@ -30,7 +30,7 @@
         		<enum value="cui">Controlled Unclassified Information</enum>
         	</allowed-values>
 
-            <allowed-values id="attachment-type" target="back-matter/resource/prop[@name='type'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="attachment-type" target="back-matter/resource/prop[@name='type'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Attachment Type</formal-name>
                 <description>Identifies the type of attachment.</description>
                 <enum value="law">Law or Statute</enum>
@@ -71,7 +71,7 @@
                 </remarks>
             </allowed-values>
 
-            <allowed-values id="authorization-type" target="system-characteristics/prop[@name='authorization-type'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="authorization-type" target="system-characteristics/prop[@name='authorization-type'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Authorization Type</formal-name>
                 <description>The FedRAMP Authorization Type</description>
                 <enum value="fedramp-jab">FedRAMP JAB P-ATO</enum>
@@ -127,7 +127,7 @@
                 <enum value="other">Other</enum>
             </allowed-values>
 
-            <allowed-values id="external-system-nature-of-agreement" target="system-implementation/component[(@type='service' and not(prop[@name='leveraged-authorization-uuid']) and prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and prop[@name='implementation-point' and @value='internal'] and prop[@name='direction']) or (@type='software' and prop[@name='asset-type' and @value='cli'] and prop[@name='direction'])]/prop[@name='nature-of-agreement' and @ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="external-system-nature-of-agreement" target="system-implementation/component[(@type='service' and not(prop[@name='leveraged-authorization-uuid']) and prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and prop[@name='implementation-point' and @value='internal'] and prop[@name='direction']) or (@type='software' and prop[@name='asset-type' and @value='cli'] and prop[@name='direction'])]/prop[@name='nature-of-agreement' and @ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Nature of Agreement for External Systems</formal-name>
                 <description>Identifies nature of agreement for external systems.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#external-systems-and-services-not-having-fedramp-authorization"/>
@@ -140,7 +140,7 @@
                 <enum value="sla">A service-level agreement between the CSP and the organization that owns the external system.</enum>
             </allowed-values>
 
-            <allowed-values id="fedramp-version" target="metadata/prop[@name='fedramp-version'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="fedramp-version" target="metadata/prop[@name='fedramp-version'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>FedRAMP Version</formal-name>
                 <description>Identifies the FedRAMP version of the document.</description>
                 <enum value="fedramp-3.0.0rc1-oscal-1.1.2">FedRAMP Version</enum>
@@ -326,7 +326,7 @@
                 <enum value="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60 Volume 2 Revision 1</enum>
             </allowed-values>
 
-            <allowed-values id="interconnection-direction" target="system-implementation/component[@type='interconnection']/prop[@name='interconnection-direction'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="interconnection-direction" target="system-implementation/component[@type='interconnection']/prop[@name='interconnection-direction'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Interconnection Direction</formal-name>
                 <description>Identifies the direction of information flow for the interconnection.</description>
                 <enum value="in">Incoming</enum>
@@ -367,7 +367,7 @@
                 <enum value="no">No</enum>
             </allowed-values>
 
-            <allowed-values id="leveraged-authorization-nature-of-agreement" target="system-implementation/component[@type='system'][prop[@name='leveraged-authorization-uuid']]/prop[@name='nature-of-agreement'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="leveraged-authorization-nature-of-agreement" target="system-implementation/component[@type='system'][prop[@name='leveraged-authorization-uuid']]/prop[@name='nature-of-agreement'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Nature of Agreement for Leveraged Authorizations</formal-name>
                 <description>Identifies nature of agreement for leveraged authorizations.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
@@ -379,7 +379,7 @@
                 <enum value="sla">A service-level agreement between the CSP and the organization that owns the leveraged system.</enum>
             </allowed-values>
 
-            <allowed-values id="privilege-level" target="system-implementation/user/prop[@name='privilege-level'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="privilege-level" target="system-implementation/user/prop[@name='privilege-level'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Privilege Level</formal-name>
                 <description>The privilege level of the user.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#user"/>
@@ -389,7 +389,7 @@
                 <enum value="no-access">No Access</enum>
               </allowed-values>
 
-            <allowed-values id="scan-type" target="system-implementation//prop[@name='scan-type'][@ns='https://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="scan-type" target="system-implementation//prop[@name='scan-type'][@ns='http://fedramp.gov/ns/oscal']/@value" allow-other="no" level="ERROR">
                 <formal-name>Scan Type</formal-name>
                 <description>Identifies the type of scan.</description>
                 <enum value="infrastructure">Infrastructure and Operating System Scan</enum>
@@ -398,7 +398,7 @@
                 <enum value="other">Other</enum>
             </allowed-values>
 
-            <allowed-values id="user-authentication" target="//component[(@type='system' and ./prop[@name='leveraged-authorization-uuid']) or (@type='service' and not(./prop[@name='leveraged-authorization-uuid']) and ./prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and ./prop[@name='implementation-point' and @value='internal'] and ./prop[@name='direction']) or (@type='software' and ./prop[@name='asset-type' and @value='cli'] and ./prop[@name='direction'])]/prop[@ns='https://fedramp.gov/ns/oscal' and @name='authentication-method']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="user-authentication" target="//component[(@type='system' and ./prop[@name='leveraged-authorization-uuid']) or (@type='service' and not(./prop[@name='leveraged-authorization-uuid']) and ./prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and ./prop[@name='implementation-point' and @value='internal'] and ./prop[@name='direction']) or (@type='software' and ./prop[@name='asset-type' and @value='cli'] and ./prop[@name='direction'])]/prop[@ns='http://fedramp.gov/ns/oscal' and @name='authentication-method']/@value" allow-other="no" level="ERROR">
                 <formal-name>User Authentication</formal-name>
                 <description>Identifies if user authentication is required.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
@@ -412,7 +412,7 @@
                 </remarks>
             </allowed-values>
 
-            <allowed-values id="user-privilege-level" target="//user/prop[@ns='https://fedramp.gov/ns/oscal' and @name='privilege-level']/@value" allow-other="no" level="ERROR">
+            <allowed-values id="user-privilege-level" target="//user/prop[@ns='http://fedramp.gov/ns/oscal' and @name='privilege-level']/@value" allow-other="no" level="ERROR">
                 <formal-name>Privilege Level</formal-name>
                 <description>The privilege level of the user.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#user"/>
@@ -422,7 +422,7 @@
                 <enum value="no-access">No Access</enum>
             </allowed-values>
 
-            <allowed-values id="user-sensitivity-level" target="//user/prop[@ns='https://fedramp.gov/ns/oscal' and @name='sensitivity']/@value"  allow-other="no" level="ERROR">
+            <allowed-values id="user-sensitivity-level" target="//user/prop[@ns='http://fedramp.gov/ns/oscal' and @name='sensitivity']/@value"  allow-other="no" level="ERROR">
                 <formal-name>User Sensitvity Level</formal-name>
                 <description>Sensitivity level of the user.</description>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#user"/>
diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml
index eebb1b89a..f8f3030ee 100644
--- a/src/validations/constraints/fedramp-external-constraints.xml
+++ b/src/validations/constraints/fedramp-external-constraints.xml
@@ -7,7 +7,7 @@
     <context>
     	<metapath target="/(assessment-plan|assessment-results|plan-of-action-and-milestones|system-security-plan)/metadata"/>
         <constraints>
-            <expect id="fedramp-version" target="." test="prop[@name='fedramp-version'][@ns='https://fedramp.gov/ns/oscal']" level="ERROR">
+            <expect id="fedramp-version" target="." test="prop[@name='fedramp-version'][@ns='http://fedramp.gov/ns/oscal']" level="ERROR">
                 <formal-name>Fedramp Version</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/general-concepts/4-expressing-common-fedramp-template-elements-in-oscal/#fedramp-version"/>
                 <message>A FedRAMP document's metadata MUST define a valid FedRAMP version.</message>
@@ -32,7 +32,7 @@
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#user"/>
                 <message>A FedRAMP document MUST define a user with at least one authorized privilege by a privilege identifier.</message>
             </expect>
-            <expect id="user-has-privilege-level" target="." test="count(prop[@name='privilege-level'][@ns='https://fedramp.gov/ns/oscal']) = 1" level="ERROR">
+            <expect id="user-has-privilege-level" target="." test="count(prop[@name='privilege-level'][@ns='http://fedramp.gov/ns/oscal']) = 1" level="ERROR">
                 <formal-name>User Has Privilege Level</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#user"/>
                 <message>A FedRAMP document MUST define a user with a privilege for their use of the system.</message>
@@ -60,7 +60,7 @@
         <metapath target="/assessment-plan/local-definitions/objectives-and-methods"/>
         <metapath target="/assessment-results/local-definitions/objectives-and-methods"/>
         <constraints>
-            <expect id="prop-response-point-has-cardinality-one" target=".//part" test="count(prop[@ns='https://fedramp.gov/ns/oscal' and @name='response-point']) &lt;= 1" level="ERROR">
+            <expect id="prop-response-point-has-cardinality-one" target=".//part" test="count(prop[@ns='http://fedramp.gov/ns/oscal' and @name='response-point']) &lt;= 1" level="ERROR">
                 <formal-name>Prop Response Point Has Cardinality One</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/6-security-controls/#control-implementation-descriptions"/>
                 <message>MUST NOT have Duplicate response point at '{ path(.) }'.</message>
@@ -81,7 +81,7 @@
             <let var="network-architecture-link" expression="system-characteristics/network-architecture/diagram/link/@href"/>
             <let var="import-profile-href" expression="import-profile/@href"/>
             <let var="resolved-import-profile-href" expression="if (starts-with($import-profile-href, '#')) then back-matter/resource[@uuid = substring($import-profile-href, 2)]/rlink/@href else $import-profile-href"/>
-            <expect id="component-has-authentication-method" target="//component[(@type='system' and ./prop[@name='leveraged-authorization-uuid']) or (@type='service' and not(./prop[@name='leveraged-authorization-uuid']) and ./prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and ./prop[@name='implementation-point' and @value='internal'] and ./prop[@name='direction']) or (@type='software' and ./prop[@name='asset-type' and @value='cli'] and ./prop[@name='direction'])]" test="count(prop[@ns='https://fedramp.gov/ns/oscal' and @name='authentication-method']) >= 1" level="ERROR">
+            <expect id="component-has-authentication-method" target="//component[(@type='system' and ./prop[@name='leveraged-authorization-uuid']) or (@type='service' and not(./prop[@name='leveraged-authorization-uuid']) and ./prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and ./prop[@name='implementation-point' and @value='internal'] and ./prop[@name='direction']) or (@type='software' and ./prop[@name='asset-type' and @value='cli'] and ./prop[@name='direction'])]" test="count(prop[@ns='http://fedramp.gov/ns/oscal' and @name='authentication-method']) >= 1" level="ERROR">
                 <formal-name>Component Has Authentication Method</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
                 <message>A FedRAMP SSP MUST include at least one authentication method for each leveraged system.</message>
@@ -106,7 +106,7 @@
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/3-working-with-oscal-files/#importing-the-fedramp-baseline"/>
                 <message>A FedRAMP SSP MUST import a profile or catalog with a valid file or HTTP(S) address.</message>
             </expect>
-            <expect id="import-profile-resolves-to-fedramp-content" target="." test="count(resolve-profile(doc(resolve-uri($resolved-import-profile-href)))//control//prop[@ns='https://fedramp.gov/ns/oscal' and @name='response-point']) >= 2" level="CRITICAL">
+            <expect id="import-profile-resolves-to-fedramp-content" target="." test="count(resolve-profile(doc(resolve-uri($resolved-import-profile-href)))//control//prop[@ns='http://fedramp.gov/ns/oscal' and @name='response-point']) >= 2" level="CRITICAL">
                 <formal-name>Import Profile resolves to Fedramp content</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/3-working-with-oscal-files/#importing-the-fedramp-baseline"/>
                 <message>A FedRAMP SSP MUST import a profile or catalog of security controls to reference implemented requirements against those control(s).</message>
@@ -274,12 +274,12 @@
     <context>
         <metapath target="/system-security-plan/system-characteristics"/>
         <constraints>
-            <expect id="fully-operational-date-is-valid" target="prop[@ns='https://fedramp.gov/ns/oscal' and @name='fully-operational-date']/@value" test=". &lt;= current-dateTime()" level="ERROR"><!-- TODO - Need metapath current-date() function -->
+            <expect id="fully-operational-date-is-valid" target="prop[@ns='http://fedramp.gov/ns/oscal' and @name='fully-operational-date']/@value" test=". &lt;= current-dateTime()" level="ERROR"><!-- TODO - Need metapath current-date() function -->
                 <formal-name>Fully Operational Date Is Valid</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#system-status"/>
                 <message>A system MUST be fully implemented prior to submitting the SSP to FedRAMP.</message>
             </expect>
-            <matches id="fully-operational-date-type" target="prop[@ns='https://fedramp.gov/ns/oscal' and @name='fully-operational-date']/@value" datatype="date-with-timezone" level="ERROR">
+            <matches id="fully-operational-date-type" target="prop[@ns='http://fedramp.gov/ns/oscal' and @name='fully-operational-date']/@value" datatype="date-with-timezone" level="ERROR">
                 <formal-name>Fully Operational Date Type</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#system-status"/>
                 <!-- Todo: add custom error message once Metaschma 'match' constraints support 'message' field. -->
@@ -287,7 +287,7 @@
                 <message>A FedRAMP SSP MUST specify the system's fully operational data as a "full-date" per RFC3339 with the addition of a timezone.</message>
                 -->
             </matches> 
-            <expect id="has-fully-operational-date" target="." test="exists(prop[@ns='https://fedramp.gov/ns/oscal' and @name='fully-operational-date'])" level="ERROR">
+            <expect id="has-fully-operational-date" target="." test="exists(prop[@ns='http://fedramp.gov/ns/oscal' and @name='fully-operational-date'])" level="ERROR">
                 <formal-name>Fully Operational Date</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#system-status"/>
                 <message>A FedRAMP SSP MUST define the system's fully operational date.</message>
@@ -483,7 +483,7 @@
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#system-sensitivity-level"/>
                 <message>A FedRAMP SSP document MUST specify a FIPS 199 categorization.</message>
             </expect>
-            <expect id="has-system-id" target="." test="system-id[@identifier-type eq 'https://fedramp.gov']" level="ERROR">
+            <expect id="has-system-id" target="." test="system-id[@identifier-type eq 'http://fedramp.gov/ns/oscal']" level="ERROR">
                 <formal-name>Has System Id</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#system-name-abbreviation-and-fedramp-unique-identifier"/>
                 <message>A FedRAMP SSP MUST have a FedRAMP system identifier.</message>
@@ -528,17 +528,17 @@
 				<prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/5-attachments/#system-inventory-approach"/>
 				<message>A FedRAMP SSP system implementation section MUST have at least two inventory items.</message>
 			</expect>
-            <expect id="leveraged-authorization-has-authorization-type" target="leveraged-authorization" test="count(prop[@name='authorization-type'][@ns='https://fedramp.gov/ns/oscal']) = 1" level="ERROR">
+            <expect id="leveraged-authorization-has-authorization-type" target="leveraged-authorization" test="count(prop[@name='authorization-type'][@ns='http://fedramp.gov/ns/oscal']) = 1" level="ERROR">
                 <formal-name>Leveraged Authorization Has Authorization Type</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
                 <message>A FedRAMP SSP MUST define exactly one authorization type for each leveraged authorization entry.</message>
             </expect>
-            <expect id="leveraged-authorization-has-impact-level" target="leveraged-authorization" test="count(prop[@name='impact-level'][@ns='https://fedramp.gov/ns/oscal']) = 1" level="ERROR">
+            <expect id="leveraged-authorization-has-impact-level" target="leveraged-authorization" test="count(prop[@name='impact-level'][@ns='http://fedramp.gov/ns/oscal']) = 1" level="ERROR">
                 <formal-name>Leveraged Authorization Has Impact Level</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
                 <message>A FedRAMP SSP MUST define exactly one impact level for each leveraged authorization entry.</message>
             </expect>
-            <expect id="leveraged-authorization-has-system-identifier" target="leveraged-authorization" test="count(prop[@name='leveraged-system-identifier'][@ns='https://fedramp.gov/ns/oscal']) = 1" level="ERROR">
+            <expect id="leveraged-authorization-has-system-identifier" target="leveraged-authorization" test="count(prop[@name='leveraged-system-identifier'][@ns='http://fedramp.gov/ns/oscal']) = 1" level="ERROR">
                 <formal-name>Leveraged Authorization Has System Identifier</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
                 <message>A FedRAMP SSP MUST define exactly one system identifier for each leveraged authorization entry.</message>
@@ -568,7 +568,7 @@
     <context>
         <metapath target="/system-security-plan/system-implementation"/>
         <constraints>
-            <expect id="authentication-method-has-remarks" target="//component[(@type='system' and ./prop[@name='leveraged-authorization-uuid']) or (@type='service' and not(./prop[@name='leveraged-authorization-uuid']) and ./prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and ./prop[@name='implementation-point' and @value='internal'] and ./prop[@name='direction']) or (@type='software' and ./prop[@name='asset-type' and @value='cli'] and ./prop[@name='direction'])]"  test="count(./prop[@name='authentication-method' and @ns='https://fedramp.gov/ns/oscal'])  = count(./prop[@name='authentication-method' and @ns='https://fedramp.gov/ns/oscal']/remarks)" level="ERROR">
+            <expect id="authentication-method-has-remarks" target="//component[(@type='system' and ./prop[@name='leveraged-authorization-uuid']) or (@type='service' and not(./prop[@name='leveraged-authorization-uuid']) and ./prop[@name='implementation-point' and @value='external']) or (@type='interconnection') or (@type='service' and ./prop[@name='implementation-point' and @value='internal'] and ./prop[@name='direction']) or (@type='software' and ./prop[@name='asset-type' and @value='cli'] and ./prop[@name='direction'])]"  test="count(./prop[@name='authentication-method' and @ns='http://fedramp.gov/ns/oscal'])  = count(./prop[@name='authentication-method' and @ns='http://fedramp.gov/ns/oscal']/remarks)" level="ERROR">
                 <formal-name>Authentication Method Has Remarks</formal-name>
                 <prop namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" name="help-url" value="https://automate.fedramp.gov/documentation/ssp/4-ssp-template-to-oscal-mapping/#leveraged-fedramp-authorized-services"/>
                 <message>Each authentication method in a FedRAMP SSP MUST have a remarks field.</message>
diff --git a/src/validations/constraints/unit-tests/has-system-id-FAIL.yaml b/src/validations/constraints/unit-tests/has-system-id-FAIL.yaml
index c63afee41..abbfdc6f0 100644
--- a/src/validations/constraints/unit-tests/has-system-id-FAIL.yaml
+++ b/src/validations/constraints/unit-tests/has-system-id-FAIL.yaml
@@ -1,6 +1,6 @@
 test-case:
   name: Negative Test for has-system-id
-  description: Test that a SSP system-characteristics system-id identifier-type attribute is not equal to 'https://fedramp.gov'.
+  description: Test that a SSP system-characteristics system-id identifier-type attribute is not equal to 'http://fedramp.gov/ns/oscal'.
   content: ../content/ssp-has-system-id-INVALID.xml
   expectations:
     - constraint-id: has-system-id
diff --git a/src/validations/constraints/unit-tests/has-system-id-PASS.yaml b/src/validations/constraints/unit-tests/has-system-id-PASS.yaml
index 2372e593e..89472914c 100644
--- a/src/validations/constraints/unit-tests/has-system-id-PASS.yaml
+++ b/src/validations/constraints/unit-tests/has-system-id-PASS.yaml
@@ -1,6 +1,6 @@
 test-case:
   name: Positive Test for has-system-id
-  description: Test that a SSP system-characteristics system-id identifier-type attribute is equal to 'https://fedramp.gov'.
+  description: Test that a SSP system-characteristics system-id identifier-type attribute is equal to 'http://fedramp.gov/ns/oscal'.
   content: ../content/ssp-all-VALID.xml
   expectations:
     - constraint-id: has-system-id