diff --git a/doc/conversion.html b/doc/conversion.html
index b9e8dd1..f2409a3 100644
--- a/doc/conversion.html
+++ b/doc/conversion.html
@@ -52,7 +52,7 @@
   <tr>
     <td width="100%" bgcolor="#E8F5FF">
       <a href="../../../boost/endian/conversion.hpp">&lt;boost/endian/conversion.hpp&gt;</a><br>
-      <a href="../../../boost/endian/integers.hpp">&lt;boost/endian/integers.hpp&gt;</a></td>
+      <a href="../../../boost/endian/types.hpp">&lt;boost/endian/types.hpp&gt;</a></td>
   </tr>
 </table>
 
diff --git a/doc/index.html b/doc/index.html
index a15b005..a02d971 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,7 +48,7 @@
   <tr>
     <td width="100%" bgcolor="#E8F5FF">
       <a href="../../../boost/endian/conversion.hpp">&lt;boost/endian/conversion.hpp&gt;</a><br>
-      <a href="../../../boost/endian/integers.hpp">&lt;boost/endian/integers.hpp&gt;</a></td>
+      <a href="../../../boost/endian/types.hpp">&lt;boost/endian/types.hpp&gt;</a></td>
   </tr>
 </table>
 <h2><a name="Abstract">Abstract</a></h2>
diff --git a/doc/integers.html b/doc/integers.html
index 3e9c014..3f0303c 100644
--- a/doc/integers.html
+++ b/doc/integers.html
@@ -65,11 +65,11 @@
   <tr>
     <td width="100%" bgcolor="#E8F5FF">
       <a href="../../../boost/endian/conversion.hpp">&lt;boost/endian/conversion.hpp&gt;</a><br>
-      <a href="../../../boost/endian/integers.hpp">&lt;boost/endian/integers.hpp&gt;</a></td>
+      <a href="../../../boost/endian/types.hpp">&lt;boost/endian/types.hpp&gt;</a></td>
   </tr>
 </table>
 <h2><a name="Introduction">Introduction</a></h2>
-<p>Header <a href="file:///D:/endian/boost/endian/integers.hpp">&lt;boost/endian/integers.hpp&gt;</a> provides 
+<p>Header <a href="file:///D:/endian/boost/endian/types.hpp">&lt;boost/endian/types.hpp&gt;</a> provides 
 integer-like byte-holder binary types with explicit control over 
 byte order, value type, size, and alignment. Typedefs provide easy-to-use names 
 for common configurations.</p>
@@ -102,7 +102,7 @@ binary file containing four byte big-endian and little-endian integers:</p>
 <blockquote>
   <pre>#include &lt;iostream&gt;
 #include &lt;cstdio&gt;
-#include &lt;boost/endian/integers.hpp&gt;
+#include &lt;boost/endian/types.hpp&gt;
 #include &lt;boost/static_assert.hpp&gt;
 
 using namespace boost::endian;
diff --git a/example/endian_example.cpp b/example/endian_example.cpp
index 48b1b0b..cba1a2d 100644
--- a/example/endian_example.cpp
+++ b/example/endian_example.cpp
@@ -15,7 +15,7 @@
 
 #include <iostream>
 #include <cstdio>
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/static_assert.hpp>
 
 using namespace boost::endian;
diff --git a/include/boost/endian/integers.hpp b/include/boost/endian/types.hpp
similarity index 99%
rename from include/boost/endian/integers.hpp
rename to include/boost/endian/types.hpp
index 6f72d35..7feb317 100644
--- a/include/boost/endian/integers.hpp
+++ b/include/boost/endian/types.hpp
@@ -1,4 +1,4 @@
-//  boost/endian/integers.hpp  ---------------------------------------------------------//
+//  boost/endian/types.hpp  ------------------------------------------------------------//
 
 //  (C) Copyright Darin Adler 2000
 //  (C) Copyright Beman Dawes 2006, 2009
diff --git a/test/endian_in_union_test.cpp b/test/endian_in_union_test.cpp
index bebebed..71e04ca 100644
--- a/test/endian_in_union_test.cpp
+++ b/test/endian_in_union_test.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/endian/detail/disable_warnings.hpp>
 
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/detail/lightweight_main.hpp>
 #include <cassert>
 
diff --git a/test/endian_operations_test.cpp b/test/endian_operations_test.cpp
index 25914c9..94ce9bf 100644
--- a/test/endian_operations_test.cpp
+++ b/test/endian_operations_test.cpp
@@ -28,7 +28,7 @@
 # pragma warning( disable : 4389 )  // signed/unsigned mismatch
 #endif
 
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/detail/lightweight_main.hpp>
 #include <cassert>
 #include <iostream>
diff --git a/test/endian_test.cpp b/test/endian_test.cpp
index e67715f..a04637c 100644
--- a/test/endian_test.cpp
+++ b/test/endian_test.cpp
@@ -18,7 +18,7 @@
 
 #include <boost/endian/detail/disable_warnings.hpp>
 
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/detail/lightweight_main.hpp>
 
diff --git a/test/speed_test.cpp b/test/speed_test.cpp
index cb0cd7d..dd67952 100644
--- a/test/speed_test.cpp
+++ b/test/speed_test.cpp
@@ -12,7 +12,7 @@
 #include <boost/endian/detail/disable_warnings.hpp>
 
 #include <boost/endian/conversion.hpp>
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/timer/timer.hpp>
 #include <iostream>