diff --git a/include/boost/beast/websocket/impl/ping.hpp b/include/boost/beast/websocket/impl/ping.hpp
index cde04386..2cbd2f71 100644
--- a/include/boost/beast/websocket/impl/ping.hpp
+++ b/include/boost/beast/websocket/impl/ping.hpp
@@ -325,15 +325,15 @@ pong(ping_data const& payload, error_code& ec)
 }
 
 template<class NextLayer, bool deflateSupported>
-template<BOOST_BEAST_ASYNC_TPARAM1 WriteHandler>
-BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
+template<BOOST_BEAST_ASYNC_TPARAM1 PingHandler>
+BOOST_BEAST_ASYNC_RESULT1(PingHandler)
 stream<NextLayer, deflateSupported>::
-async_ping(ping_data const& payload, WriteHandler&& handler)
+async_ping(ping_data const& payload, PingHandler&& handler)
 {
     static_assert(is_async_stream<next_layer_type>::value,
         "AsyncStream type requirements not met");
     return net::async_initiate<
-        WriteHandler,
+        PingHandler,
         void(error_code)>(
             run_ping_op{},
             handler,
@@ -343,15 +343,15 @@ async_ping(ping_data const& payload, WriteHandler&& handler)
 }
 
 template<class NextLayer, bool deflateSupported>
-template<BOOST_BEAST_ASYNC_TPARAM1 WriteHandler>
-BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
+template<BOOST_BEAST_ASYNC_TPARAM1 PongHandler>
+BOOST_BEAST_ASYNC_RESULT1(PongHandler)
 stream<NextLayer, deflateSupported>::
-async_pong(ping_data const& payload, WriteHandler&& handler)
+async_pong(ping_data const& payload, PongHandler&& handler)
 {
     static_assert(is_async_stream<next_layer_type>::value,
         "AsyncStream type requirements not met");
     return net::async_initiate<
-        WriteHandler,
+        PongHandler,
         void(error_code)>(
             run_ping_op{},
             handler,
diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index fdbf0707..7c1f118b 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -1762,13 +1762,13 @@ public:
         so that only closing it is guaranteed to succeed.
     */
     template<
-        BOOST_BEAST_ASYNC_TPARAM1 WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 PingHandler =
             net::default_completion_token_t<executor_type>
     >
-    BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
+    BOOST_BEAST_ASYNC_RESULT1(PingHandler)
     async_ping(
         ping_data const& payload,
-        WriteHandler&& handler =
+        PingHandler&& handler =
             net::default_completion_token_t<
                 executor_type>{});
 
@@ -1885,13 +1885,13 @@ public:
         so that only closing it is guaranteed to succeed.
     */
     template<
-        BOOST_BEAST_ASYNC_TPARAM1 WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 PongHandler =
             net::default_completion_token_t<executor_type>
     >
-    BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
+    BOOST_BEAST_ASYNC_RESULT1(PongHandler)
     async_pong(
         ping_data const& payload,
-        WriteHandler&& handler =
+        PongHandler&& handler =
             net::default_completion_token_t<
                 executor_type>{});