diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13544c58..157d57cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,14 @@ API Changes:
 * buffers_suffix replaces consuming_buffers
 * buffers_prefix replaces buffer_prefix
 * buffers_prefix_view replaces buffer_prefix_view
+* buffers_front replaces buffer_front
 
 Actions Required:
 
 * Use buffers_suffix instead of consuming_buffers
 * Use buffers_prefix instead of buffer_prefix
 * Use buffers_prefix_view instead of buffer_prefix_view
+* Use buffers_front instead of buffer_front
 
 --------------------------------------------------------------------------------
 
diff --git a/doc/qbk/03_core/3_buffers.qbk b/doc/qbk/03_core/3_buffers.qbk
index cd1ca070..8f00b471 100644
--- a/doc/qbk/03_core/3_buffers.qbk
+++ b/doc/qbk/03_core/3_buffers.qbk
@@ -123,7 +123,7 @@ transferred.
     [link beast.ref.boost__beast__buffer_cat `buffer_cat`].
 ]]
 [[
-    [link beast.ref.boost__beast__buffer_front `buffer_front`]
+    [link beast.ref.boost__beast__buffers_front `buffers_front`]
 ][
     This function returns the first buffer in a buffer sequence,
     or a buffer of size zero if the buffer sequence has no elements.
diff --git a/doc/qbk/quickref.xml b/doc/qbk/quickref.xml
index 232b8a0f..9dc1dc69 100644
--- a/doc/qbk/quickref.xml
+++ b/doc/qbk/quickref.xml
@@ -216,8 +216,8 @@
           <simplelist type="vert" columns="1">
             <member><link linkend="beast.ref.boost__beast__bind_handler">bind_handler</link></member>
             <member><link linkend="beast.ref.boost__beast__buffer_cat">buffer_cat</link></member>
-            <member><link linkend="beast.ref.boost__beast__buffer_front">buffer_front</link></member>
             <member><link linkend="beast.ref.boost__beast__buffers">buffers</link></member>
+            <member><link linkend="beast.ref.boost__beast__buffers_front">buffers_front</link></member>
             <member><link linkend="beast.ref.boost__beast__buffers_prefix">buffers_prefix</link></member>
             <member><link linkend="beast.ref.boost__beast__generic_category">generic_category</link></member>
             <member><link linkend="beast.ref.boost__beast__iequals">iequals</link></member>
diff --git a/include/boost/beast/core/buffers_prefix.hpp b/include/boost/beast/core/buffers_prefix.hpp
index b1959dd3..4033354d 100644
--- a/include/boost/beast/core/buffers_prefix.hpp
+++ b/include/boost/beast/core/buffers_prefix.hpp
@@ -224,7 +224,7 @@ typename std::conditional<
     is_mutable_buffer_sequence<BufferSequence>::value,
     boost::asio::mutable_buffer,
     boost::asio::const_buffer>::type
-buffer_front(BufferSequence const& buffers)
+buffers_front(BufferSequence const& buffers)
 {
     auto const first = buffers.begin();
     if(first == buffers.end())
diff --git a/include/boost/beast/websocket/impl/read.ipp b/include/boost/beast/websocket/impl/read.ipp
index 5b3c55e3..18f55224 100644
--- a/include/boost/beast/websocket/impl/read.ipp
+++ b/include/boost/beast/websocket/impl/read.ipp
@@ -484,7 +484,7 @@ operator()(
                 }
                 zlib::z_params zs;
                 {
-                    auto const out = buffer_front(cb_);
+                    auto const out = buffers_front(cb_);
                     zs.next_out = buffer_cast<void*>(out);
                     zs.avail_out = buffer_size(out);
                     BOOST_ASSERT(zs.avail_out > 0);
@@ -495,7 +495,7 @@ operator()(
                     {
                         // use what's there
                         auto const in = buffers_prefix(
-                            clamp(ws_.rd_remain_), buffer_front(
+                            clamp(ws_.rd_remain_), buffers_front(
                                 ws_.rd_buf_.data()));
                         zs.avail_in = buffer_size(in);
                         zs.next_in = buffer_cast<void const*>(in);
@@ -1183,7 +1183,7 @@ loop:
         {
             zlib::z_params zs;
             {
-                auto const out = buffer_front(cb);
+                auto const out = buffers_front(cb);
                 zs.next_out = buffer_cast<void*>(out);
                 zs.avail_out = buffer_size(out);
                 BOOST_ASSERT(zs.avail_out > 0);
@@ -1194,7 +1194,7 @@ loop:
                 {
                     // use what's there
                     auto const in = buffers_prefix(
-                        clamp(rd_remain_), buffer_front(
+                        clamp(rd_remain_), buffers_front(
                             rd_buf_.data()));
                     zs.avail_in = buffer_size(in);
                     zs.next_in = buffer_cast<void const*>(in);
@@ -1216,7 +1216,7 @@ loop:
                             buffers_prefix(clamp(rd_remain_),
                                 rd_buf_.data()), rd_key_);
                     auto const in = buffers_prefix(
-                        clamp(rd_remain_), buffer_front(
+                        clamp(rd_remain_), buffers_front(
                             rd_buf_.data()));
                     zs.avail_in = buffer_size(in);
                     zs.next_in = buffer_cast<void const*>(in);