diff --git a/include/msgpack/adaptor/tr1/unordered_map.hpp b/include/msgpack/adaptor/tr1/unordered_map.hpp
index c08c97be..763d7427 100644
--- a/include/msgpack/adaptor/tr1/unordered_map.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_map.hpp
@@ -23,7 +23,7 @@
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
 
-#define MSGPACK_HAS_STD_UNOURDERED_MAP
+#define MSGPACK_HAS_STD_UNORDERED_MAP
 #include <unordered_map>
 #define MSGPACK_STD_TR1 std
 
@@ -31,7 +31,7 @@
 
 #if __GNUC__ >= 4
 
-#define MSGPACK_HAS_STD_TR1_UNOURDERED_MAP
+#define MSGPACK_HAS_STD_TR1_UNORDERED_MAP
 
 #include <tr1/unordered_map>
 #define MSGPACK_STD_TR1 std::tr1
diff --git a/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp b/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
index 4861e1ad..c3aefde1 100644
--- a/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
@@ -23,7 +23,7 @@
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
 
-#define MSGPACK_HAS_STD_UNOURDERED_MAP
+#define MSGPACK_HAS_STD_UNORDERED_MAP
 #include <unordered_map>
 #define MSGPACK_STD_TR1 std
 
@@ -31,7 +31,7 @@
 
 #if __GNUC__ >= 4
 
-#define MSGPACK_HAS_STD_TR1_UNOURDERED_MAP
+#define MSGPACK_HAS_STD_TR1_UNORDERED_MAP
 
 #include <tr1/unordered_map>
 #define MSGPACK_STD_TR1 std::tr1
diff --git a/include/msgpack/adaptor/tr1/unordered_set.hpp b/include/msgpack/adaptor/tr1/unordered_set.hpp
index fb8dc3e6..4542dda1 100644
--- a/include/msgpack/adaptor/tr1/unordered_set.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_set.hpp
@@ -23,7 +23,7 @@
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
 
-#define MSGPACK_HAS_STD_UNOURDERED_SET
+#define MSGPACK_HAS_STD_UNORDERED_SET
 #include <unordered_set>
 #define MSGPACK_STD_TR1 std
 
@@ -31,7 +31,7 @@
 
 #if __GNUC__ >= 4
 
-#define MSGPACK_HAS_STD_TR1_UNOURDERED_SET
+#define MSGPACK_HAS_STD_TR1_UNORDERED_SET
 
 #include <tr1/unordered_set>
 #define MSGPACK_STD_TR1 std::tr1
diff --git a/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp b/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
index 95d1eb4a..fa71e8b2 100644
--- a/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
@@ -23,7 +23,7 @@
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
 
-#define MSGPACK_HAS_STD_UNOURDERED_SET
+#define MSGPACK_HAS_STD_UNORDERED_SET
 #include <unordered_set>
 #define MSGPACK_STD_TR1 std
 
@@ -31,7 +31,7 @@
 
 #if __GNUC__ >= 4
 
-#define MSGPACK_HAS_STD_TR1_UNOURDERED_SET
+#define MSGPACK_HAS_STD_TR1_UNORDERED_SET
 
 #include <tr1/unordered_set>
 #define MSGPACK_STD_TR1 std::tr1
diff --git a/test/msgpack_container.cpp b/test/msgpack_container.cpp
index febef394..6d231c29 100644
--- a/test/msgpack_container.cpp
+++ b/test/msgpack_container.cpp
@@ -217,7 +217,7 @@ TEST(MSGPACK_TUPLE, simple_tuple_empty)
 
 // TR1
 
-#ifdef MSGPACK_HAS_STD_TR1_UNOURDERED_MAP
+#ifdef MSGPACK_HAS_STD_TR1_UNORDERED_MAP
 #include <tr1/unordered_map>
 #include "msgpack/adaptor/tr1/unordered_map.hpp"
 TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_map)
@@ -270,7 +270,7 @@ TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_multimap)
 }
 #endif
 
-#ifdef MSGPACK_HAS_STD_TR1_UNOURDERED_SET
+#ifdef MSGPACK_HAS_STD_TR1_UNORDERED_SET
 #include <tr1/unordered_set>
 #include "msgpack/adaptor/tr1/unordered_set.hpp"
 TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_set)
@@ -318,7 +318,7 @@ TEST(MSGPACK_TR1, simple_buffer_tr1_unordered_multiset)
 }
 #endif
 
-#ifdef MSGPACK_HAS_STD_UNOURDERED_MAP
+#ifdef MSGPACK_HAS_STD_UNORDERED_MAP
 #include <unordered_map>
 #include "msgpack/adaptor/tr1/unordered_map.hpp"
 TEST(MSGPACK_TR1, simple_buffer_unordered_map)
@@ -371,7 +371,7 @@ TEST(MSGPACK_TR1, simple_buffer_unordered_multimap)
 }
 #endif
 
-#ifdef MSGPACK_HAS_STD_UNOURDERED_SET
+#ifdef MSGPACK_HAS_STD_UNORDERED_SET
 #include <unordered_set>
 #include "msgpack/adaptor/tr1/unordered_set.hpp"
 TEST(MSGPACK_TR1, simple_buffer_unordered_set)
diff --git a/test/object_with_zone.cpp b/test/object_with_zone.cpp
index b020e3b3..2869c74e 100644
--- a/test/object_with_zone.cpp
+++ b/test/object_with_zone.cpp
@@ -398,7 +398,7 @@ TEST(object_with_zone, msgpack_tuple_empty)
 
 // TR1
 
-#ifdef MSGPACK_HAS_STD_TR1_UNOURDERED_MAP
+#ifdef MSGPACK_HAS_STD_TR1_UNORDERED_MAP
 #include <tr1/unordered_map>
 #include "msgpack/adaptor/tr1/unordered_map.hpp"
 TEST(object_with_zone, tr1_unordered_map)
@@ -449,7 +449,7 @@ TEST(object_with_zone, tr1_unordered_multimap)
 }
 #endif
 
-#ifdef MSGPACK_HAS_STD_TR1_UNOURDERED_SET
+#ifdef MSGPACK_HAS_STD_TR1_UNORDERED_SET
 #include <tr1/unordered_set>
 #include "msgpack/adaptor/tr1/unordered_set.hpp"
 TEST(object_with_zone, tr1_unordered_set)
@@ -497,7 +497,7 @@ TEST(object_with_zone, tr1_unordered_multiset)
 }
 #endif
 
-#ifdef MSGPACK_HAS_STD_UNOURDERED_MAP
+#ifdef MSGPACK_HAS_STD_UNORDERED_MAP
 #include <unordered_map>
 #include "msgpack/adaptor/tr1/unordered_map.hpp"
 TEST(object_with_zone, unordered_map)
@@ -547,7 +547,7 @@ TEST(object_with_zone, unordered_multimap)
 }
 #endif
 
-#ifdef MSGPACK_HAS_STD_UNOURDERED_SET
+#ifdef MSGPACK_HAS_STD_UNORDERED_SET
 #include <unordered_set>
 #include "msgpack/adaptor/tr1/unordered_set.hpp"
 TEST(object_with_zone, unordered_set)