diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 49d12597a0..535ac407f3 100644
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -188,7 +188,7 @@
                 <xs:element minOccurs="1" maxOccurs="unbounded" ref="FvImageNames"/>
                 <xs:element minOccurs="0" maxOccurs="1" ref="FvImageOptions"/>
             </xs:sequence>
-            <xs:attribute name="Type" type="xs:string" use="optional"/>
+            <xs:attribute name="Type" type="FvImageTypes" use="optional"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="FvImageName">
@@ -199,7 +199,7 @@
             <xs:attribute name="Name" type="FvRegionTypes" use="required"/>
         </xs:complexType>
     </xs:element>
-    <xs:element name="FvImageNames" type="xs:string"/>
+    <xs:element name="FvImageNames" type="xs:NCName"/>
     <xs:element name="FvImageOptions">
         <xs:annotation>
             <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
@@ -363,6 +363,13 @@
             <xs:enumeration value="4MB"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="FvImageTypes">
+        <xs:restriction base="xs:NCName">
+            <xs:enumeration value="Attributes"/>
+            <xs:enumeration value="Options"/>
+            <xs:enumeration value="Components"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="FvSubRegionTypes">
         <xs:restriction base="UCNameType">
             <xs:enumeration value="NV_VARIABLE_STORE"/>