diff --git a/gdb-xml/arm-neon.xml b/gdb-xml/arm-neon.xml
index 39f435ee9c..ce3ee03ec4 100644
--- a/gdb-xml/arm-neon.xml
+++ b/gdb-xml/arm-neon.xml
@@ -5,7 +5,7 @@
      are permitted in any medium without royalty provided the copyright
      notice and this notice are preserved.  -->
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
-<feature name="org.gnu.gdb.arm.neon">
+<feature name="org.gnu.gdb.arm.vfp">
   <vector id="neon_uint8x8" type="uint8" count="8"/>
   <vector id="neon_uint16x4" type="uint16" count="4"/>
   <vector id="neon_uint32x2" type="uint32" count="2"/>
diff --git a/gdb-xml/arm-vfp3.xml b/gdb-xml/arm-vfp3.xml
index 5b38bc5313..227afd8017 100644
--- a/gdb-xml/arm-vfp3.xml
+++ b/gdb-xml/arm-vfp3.xml
@@ -5,7 +5,7 @@
      are permitted in any medium without royalty provided the copyright
      notice and this notice are preserved.  -->
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
-<feature name="org.gnu.gdb.arm.vfpv3">
+<feature name="org.gnu.gdb.arm.vfp">
   <reg name="d0" bitsize="64" type="float"/>
   <reg name="d1" bitsize="64" type="float"/>
   <reg name="d2" bitsize="64" type="float"/>