diff --git a/xml/System.Windows.Markup/XmlAttributeProperties.xml b/xml/System.Windows.Markup/XmlAttributeProperties.xml
index a5bb7d7600a..1656c964a20 100644
--- a/xml/System.Windows.Markup/XmlAttributeProperties.xml
+++ b/xml/System.Windows.Markup/XmlAttributeProperties.xml
@@ -34,12 +34,12 @@
   </Docs>
   <Members>
     <Member MemberName="GetXmlNamespaceMaps">
-      <MemberSignature Language="C#" Value="public static string GetXmlNamespaceMaps (System.Windows.DependencyObject dependencyObject);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig string GetXmlNamespaceMaps(class System.Windows.DependencyObject dependencyObject) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Collections.Hashtable GetXmlNamespaceMaps (System.Windows.DependencyObject dependencyObject);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Collections.Hashtable GetXmlNamespaceMaps(class System.Windows.DependencyObject dependencyObject) cil managed" />
       <MemberSignature Language="DocId" Value="M:System.Windows.Markup.XmlAttributeProperties.GetXmlNamespaceMaps(System.Windows.DependencyObject)" />
-      <MemberSignature Language="VB.NET" Value="Public Shared Function GetXmlNamespaceMaps (dependencyObject As DependencyObject) As String" />
-      <MemberSignature Language="F#" Value="static member GetXmlNamespaceMaps : System.Windows.DependencyObject -&gt; string" Usage="System.Windows.Markup.XmlAttributeProperties.GetXmlNamespaceMaps dependencyObject" />
-      <MemberSignature Language="C++ CLI" Value="public:&#xA; static System::String ^ GetXmlNamespaceMaps(System::Windows::DependencyObject ^ dependencyObject);" />
+      <MemberSignature Language="VB.NET" Value="Public Shared Function GetXmlNamespaceMaps (dependencyObject As DependencyObject) As Hashtable" />
+      <MemberSignature Language="F#" Value="static member GetXmlNamespaceMaps : System.Windows.DependencyObject -&gt; System.Collections.Hashtable" Usage="System.Windows.Markup.XmlAttributeProperties.GetXmlNamespaceMaps dependencyObject" />
+      <MemberSignature Language="C++ CLI" Value="public:&#xA; static System::Collections::Hashtable ^ GetXmlNamespaceMaps(System::Windows::DependencyObject ^ dependencyObject);" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>PresentationFramework</AssemblyName>
@@ -61,7 +61,7 @@
         </Attribute>
       </Attributes>
       <ReturnValue>
-        <ReturnType>System.String</ReturnType>
+        <ReturnType>System.Collections.Hashtable</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="dependencyObject" Type="System.Windows.DependencyObject" />
@@ -207,12 +207,12 @@
       </Docs>
     </Member>
     <Member MemberName="SetXmlNamespaceMaps">
-      <MemberSignature Language="C#" Value="public static void SetXmlNamespaceMaps (System.Windows.DependencyObject dependencyObject, string value);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetXmlNamespaceMaps(class System.Windows.DependencyObject dependencyObject, string value) cil managed" />
-      <MemberSignature Language="DocId" Value="M:System.Windows.Markup.XmlAttributeProperties.SetXmlNamespaceMaps(System.Windows.DependencyObject,System.String)" />
-      <MemberSignature Language="VB.NET" Value="Public Shared Sub SetXmlNamespaceMaps (dependencyObject As DependencyObject, value As String)" />
-      <MemberSignature Language="F#" Value="static member SetXmlNamespaceMaps : System.Windows.DependencyObject * string -&gt; unit" Usage="System.Windows.Markup.XmlAttributeProperties.SetXmlNamespaceMaps (dependencyObject, value)" />
-      <MemberSignature Language="C++ CLI" Value="public:&#xA; static void SetXmlNamespaceMaps(System::Windows::DependencyObject ^ dependencyObject, System::String ^ value);" />
+      <MemberSignature Language="C#" Value="public static void SetXmlNamespaceMaps (System.Windows.DependencyObject dependencyObject, System.Collections.Hashtable value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetXmlNamespaceMaps(class System.Windows.DependencyObject dependencyObject, class System.Collections.Hashtable value) cil managed" />
+      <MemberSignature Language="DocId" Value="M:System.Windows.Markup.XmlAttributeProperties.SetXmlNamespaceMaps(System.Windows.DependencyObject,System.Collections.Hashtable)" />
+      <MemberSignature Language="VB.NET" Value="Public Shared Sub SetXmlNamespaceMaps (dependencyObject As DependencyObject, value As Hashtable)" />
+      <MemberSignature Language="F#" Value="static member SetXmlNamespaceMaps : System.Windows.DependencyObject * System.Collections.Hashtable -&gt; unit" Usage="System.Windows.Markup.XmlAttributeProperties.SetXmlNamespaceMaps (dependencyObject, value)" />
+      <MemberSignature Language="C++ CLI" Value="public:&#xA; static void SetXmlNamespaceMaps(System::Windows::DependencyObject ^ dependencyObject, System::Collections::Hashtable ^ value);" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>PresentationFramework</AssemblyName>
@@ -228,11 +228,11 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="dependencyObject" Type="System.Windows.DependencyObject" />
-        <Parameter Name="value" Type="System.String" />
+        <Parameter Name="value" Type="System.Collections.Hashtable" />
       </Parameters>
       <Docs>
         <param name="dependencyObject">The object on which to set the <see cref="P:System.Windows.Markup.XmlAttributeProperties.XmlNamespaceMaps" /> attached property.</param>
-        <param name="value">The string value to set.</param>
+        <param name="value">The Hashtable value to set.</param>
         <summary>Sets the value of the <see cref="P:System.Windows.Markup.XmlAttributeProperties.XmlNamespaceMaps" /> attached property of the specified <see cref="T:System.Windows.DependencyObject" />.</summary>
         <remarks>To be added.</remarks>
         <exception cref="T:System.ArgumentNullException">