diff --git a/websocketpp/config/core.hpp b/websocketpp/config/core.hpp
index 967f60451d..db90e2e08c 100644
--- a/websocketpp/config/core.hpp
+++ b/websocketpp/config/core.hpp
@@ -103,7 +103,7 @@ struct core {
         /**
          * Exactly what this includes depends on the socket policy in use
          */
-        static const long timeout_socket_preinit = 5000;
+        static const long timeout_socket_pre_init = 5000;
         
         /// Length of time to wait before a proxy handshake is aborted
         static const long timeout_proxy = 5000;
@@ -113,7 +113,7 @@ struct core {
          * Exactly what this includes depends on the socket policy in use.
          * Often this means the TLS handshake
          */
-        static const long timeout_socket_postinit = 5000;
+        static const long timeout_socket_post_init = 5000;
         
         /// Length of time to wait for dns resolution
         static const long timeout_dns_resolve = 5000;
diff --git a/websocketpp/config/core_client.hpp b/websocketpp/config/core_client.hpp
index 4880f8ae63..777981805c 100644
--- a/websocketpp/config/core_client.hpp
+++ b/websocketpp/config/core_client.hpp
@@ -104,7 +104,7 @@ struct core_client {
         /**
          * Exactly what this includes depends on the socket policy in use
          */
-        static const long timeout_socket_preinit = 5000;
+        static const long timeout_socket_pre_init = 5000;
         
         /// Length of time to wait before a proxy handshake is aborted
         static const long timeout_proxy = 5000;
@@ -114,7 +114,7 @@ struct core_client {
          * Exactly what this includes depends on the socket policy in use.
          * Often this means the TLS handshake
          */
-        static const long timeout_socket_postinit = 5000;
+        static const long timeout_socket_post_init = 5000;
         
         /// Length of time to wait for dns resolution
         static const long timeout_dns_resolve = 5000;
diff --git a/websocketpp/config/debug.hpp b/websocketpp/config/debug.hpp
index 8690e62f0d..64b6206e5a 100644
--- a/websocketpp/config/debug.hpp
+++ b/websocketpp/config/debug.hpp
@@ -104,7 +104,7 @@ struct debug_core {
         /**
          * Exactly what this includes depends on the socket policy in use
          */
-        static const long timeout_socket_preinit = 5000;
+        static const long timeout_socket_pre_init = 5000;
         
         /// Length of time to wait before a proxy handshake is aborted
         static const long timeout_proxy = 5000;
@@ -114,7 +114,7 @@ struct debug_core {
          * Exactly what this includes depends on the socket policy in use.
          * Often this means the TLS handshake
          */
-        static const long timeout_socket_postinit = 5000;
+        static const long timeout_socket_post_init = 5000;
         
         /// Length of time to wait for dns resolution
         static const long timeout_dns_resolve = 5000;