diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml
index b4def97907..34206f4f4d 100644
--- a/src/metaschema/oscal_implementation-common_metaschema.xml
+++ b/src/metaschema/oscal_implementation-common_metaschema.xml
@@ -193,7 +193,7 @@
                         <enum value="isa-remote-system-name">The name of the remote interconnected system.</enum>
             &allowed-values-property-name-networked-components;
                   </allowed-values>
-                  <allowed-values id="oscal-component-service-software-prop-name-values" target="[@type=('service', 'software')]/prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
+                  <allowed-values id="oscal-component-service-software-prop-name-values" target="[@type=('interconnection', 'service', 'software', 'system')]/prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
             &allowed-values-property-name-networked-components;                        
                   </allowed-values> 
                   <allowed-values  id="oscal-component-prop-ipaddress-class-values" target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name=('ipv4-address','ipv6-address')]/@class">
@@ -567,25 +567,6 @@
                         <enum value="mac-address">The media access control (MAC) address for the asset.</enum>
                         <enum value="physical-location">The physical location of the asset's hardware (e.g., Data Center ID, Cage#, Rack#, or other meaningful location identifiers).</enum>
                         <enum value="is-scanned">is the asset subjected to network scans? (yes/no)</enum>
-                        <!-- =========================================================================================== -->
-                        <!-- = The following is to support the legacy approach for inventory-items without components. = -->
-                        <!-- =========================================================================================== -->
-                        <!-- This is "model" in the context of a component -->
-                        <enum value="hardware-model">The model number of the hardware used by the asset.</enum>
-                        <!-- This is "name" in the context of a component -->
-                        <enum value="os-name">The name of the operating system used by the asset.</enum>
-                        <!-- This is "version" in the context of a component -->
-                        <enum value="os-version">The version of the operating system used by the asset.</enum>
-                        <!-- This is "name" in the context of a component -->
-                        <enum value="software-name">The software product name used by the asset.</enum>
-                        <!-- This is "version" in the context of a component -->
-                        <enum value="software-version">The software product version used by the asset.</enum>
-                        <!-- This is "patch-level" in the context of a component -->
-                        <enum value="software-patch-level">The software product patch level used by the asset.</enum>
-
-                        <!-- =========================================================================================== -->
-                        <!-- = The following is shared with system-component. = -->
-                        <!-- =========================================================================================== -->
                         &allowed-values-component_inventory-item_property-name;
 
                   </allowed-values>
diff --git a/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent b/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent
index cf26a06ffe..75927ba766 100644
--- a/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent
+++ b/src/metaschema/shared-constraints/allowed-values-component_inventory-item_property-name.ent
@@ -11,3 +11,10 @@
 <enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="baseline-configuration-name">The name of the baseline configuration for the asset.</enum>
 <enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="allows-authenticated-scan">Can the asset be check with an authenticated scan? (yes/no)</enum>
 <enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="function">The function provided by the asset for the system.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="hardware-model" deprecated="1.1.4">**(deprecated)** Use 'model' instead.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="model">The model of system used by the asset.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="os-name">The name of the operating system used by the asset.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="os-version">The version of the operating system used by the asset.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="software-name">The software product name used by the asset.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="software-version">The software product version used by the asset.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="software-patch-level">The software product patch level used by the asset.</enum>
diff --git a/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent b/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent
index d6bcbbf67c..d33e8c0dcf 100644
--- a/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent
+++ b/src/metaschema/shared-constraints/allowed-values-property-name-networked-components.ent
@@ -1,4 +1,5 @@
-<enum value="ipv4-address">The Internet Protocol Version 4 address is for an interconnection, service, or software component.</enum>
-<enum value="ipv6-address">The Internet Protocol Version 6 address is for an interconnection, service, or software component.</enum>
-<enum value="direction">The direction categorizes the network connectivity of an interconnection, service, or software component.</enum>
-<enum value="uri">A Uniform Resource Identifier (URI) is for an interconnection, service, or software component.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="ipv4-address">The Internet Protocol Version 4 address is for an interconnection, service, or software component.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="ipv6-address">The Internet Protocol Version 6 address is for an interconnection, service, or software component.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="direction">The direction categorizes the network connectivity of an interconnection, service, or software component.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="uri">A Uniform Resource Identifier (URI) is for an interconnection, service, or software component.</enum>
+<enum xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" value="fqdn">The full-qualified domain name (FQDN) of the asset.</enum>