diff --git a/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml
index 45cbc657a..2f2d9c5a4 100644
--- a/src/types/definitions/chp_type.xml
+++ b/src/types/definitions/chp_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="CHP" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record id="0x101B" name="CHP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Character Properties.</description>
diff --git a/src/types/definitions/dop_type.xml b/src/types/definitions/dop_type.xml
index a3e43b932..0cb162d16 100644
--- a/src/types/definitions/dop_type.xml
+++ b/src/types/definitions/dop_type.xml
@@ -1,4 +1,4 @@
-<record fromfile="true" name="DOP" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record fromfile="true" name="DOP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Document Properties.</description>
@@ -12,7 +12,7 @@
         <bit number="4" mask="0x60" name="fpc"/>
         <bit number="5" mask="0x80" name="unused1"/>
       </field>
-      <field type="short" size="2" name="unused2"/>
+      <field type="byte" size="1" name="unused2"/>
       <field type="short" size="2" name="footnoteInfo">
         <bit number="0" mask="0x0003" name="rncFtn"/>
         <bit number="1" mask="0xfffc" name="nFtn"/>
diff --git a/src/types/definitions/fib_type.xml b/src/types/definitions/fib_type.xml
index be009e0e7..af4e4b1b1 100644
--- a/src/types/definitions/fib_type.xml
+++ b/src/types/definitions/fib_type.xml
@@ -1,4 +1,4 @@
-<record fromfile="true" name="FIB" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record fromfile="true" name="FIB" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>File information Block.</description>
@@ -247,10 +247,10 @@
     <field type="int" size="4" name="lcbSttbAutoCaption"/>
     <field type="int" size="4" name="fcPlcfwkb"/>
     <field type="int" size="4" name="lcbPlcfwkb"/>
-    <!-- 
+    <!--
         possible typo - was
         <field type="int" size="4" name="fcPlcfsplfcPlcfspl"/>
-        
+
         documented as fcPlcfspl in MS Word Binary Format doc
     -->
     <field type="int" size="4" name="fcPlcfspl"/>
@@ -275,7 +275,7 @@
         Bug - this field is meant to be an array that "overlays"
               the following fields.  See MS Word Binary Format doc
               for details.
-        <field type="int" size="4" name="rgpgdbkd"/> 
+        <field type="int" size="4" name="rgpgdbkd"/>
     -->
     <field type="int" size="4" name="fcPgdMother"/>
     <field type="int" size="4" name="lcbPgdMother"/>
@@ -333,7 +333,7 @@
         Bug - this field is meant to "overlay" the following
               two fields.  See MS Word Binary Format doc
               for details.
-        <field type="int" size="4" name="ftModified"/> 
+        <field type="int" size="4" name="ftModified"/>
     -->
     <field type="int" size="4" name="dwLowDateTime"/>
     <field type="int" size="4" name="dwHighDateTime"/>
diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
index c2699fa0d..c20df2b46 100644
--- a/src/types/definitions/pap_type.xml
+++ b/src/types/definitions/pap_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101A" name="PAP" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record id="0x101A" name="PAP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Paragraph Properties.</description>
diff --git a/src/types/definitions/sep_type.xml b/src/types/definitions/sep_type.xml
index 0bbbb3389..a781102b2 100644
--- a/src/types/definitions/sep_type.xml
+++ b/src/types/definitions/sep_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="SEP" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record id="0x101B" name="SEP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Section Properties.</description>
@@ -64,4 +64,4 @@
       <field type="short" size="2" name="unused6"/>
       <field type="byte[]" size="212" name="olstAnm"/>
     </fields>
-</record>
\ No newline at end of file
+</record>
diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
index 5b338b345..d4fb4e8db 100644
--- a/src/types/definitions/tap_type.xml
+++ b/src/types/definitions/tap_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="TAP" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record id="0x101B" name="TAP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Table Properties.</description>
@@ -21,4 +21,4 @@
       <field type="short[]" size="4" name="brcVertical"/>
       <field type="short[]" size="4" name="brcHorizontal"/>
     </fields>
-</record>
\ No newline at end of file
+</record>
diff --git a/src/types/definitions/tc_type.xml b/src/types/definitions/tc_type.xml
index 7644f3782..4ff0016cc 100644
--- a/src/types/definitions/tc_type.xml
+++ b/src/types/definitions/tc_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="TC" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record id="0x101B" name="TC" package="org.apache.poi.hwpf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Table Cell Descriptor.</description>
@@ -20,4 +20,4 @@
       <field type="short[]" size="4" name="brcBottom"/>
       <field type="short[]" size="4" name="brcRight"/>
     </fields>
-</record>
\ No newline at end of file
+</record>