diff --git a/CHANGELOG.md b/CHANGELOG.md
index d33d4964..bee69f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Version 61:
 * Reorganize SSL examples
 * Tidy up some integer conversion warnings
 * Add message::header_part()
+* Tidy up names in error categories
 
 API Changes:
 
diff --git a/include/beast/http/impl/error.ipp b/include/beast/http/impl/error.ipp
index af7236f7..9e2a4be7 100644
--- a/include/beast/http/impl/error.ipp
+++ b/include/beast/http/impl/error.ipp
@@ -30,7 +30,7 @@ public:
     const char*
     name() const noexcept override
     {
-        return "http";
+        return "beast.http";
     }
 
     std::string
@@ -38,7 +38,6 @@ public:
     {
         switch(static_cast<error>(ev))
         {
-        default:
         case error::end_of_stream: return "end of stream";
         case error::partial_message: return "partial message";
         case error::need_more: return "need more";
@@ -57,6 +56,9 @@ public:
         case error::bad_transfer_encoding: return "bad Transfer-Encoding";
         case error::bad_chunk: return "bad chunk";
         case error::bad_obs_fold: return "bad obs-fold";
+
+        default:
+            return "beast.http error";
         }
     }
 
diff --git a/include/beast/websocket/impl/error.ipp b/include/beast/websocket/impl/error.ipp
index b442856d..96b03585 100644
--- a/include/beast/websocket/impl/error.ipp
+++ b/include/beast/websocket/impl/error.ipp
@@ -28,7 +28,7 @@ public:
     const char*
     name() const noexcept override
     {
-        return "websocket";
+        return "beast.websocket";
     }
 
     std::string
@@ -41,7 +41,7 @@ public:
         case error::handshake_failed: return "WebSocket Upgrade handshake failed";
 
         default:
-            return "websocket error";
+            return "beast.websocket error";
         }
     }
 
diff --git a/include/beast/zlib/impl/error.ipp b/include/beast/zlib/impl/error.ipp
index f5cf1208..50b28423 100644
--- a/include/beast/zlib/impl/error.ipp
+++ b/include/beast/zlib/impl/error.ipp
@@ -58,7 +58,7 @@ public:
     const char*
     name() const noexcept override
     {
-        return "zlib";
+        return "beast.zlib";
     }
 
     std::string
@@ -85,7 +85,7 @@ public:
 
         case error::general:
         default:
-            return "zlib error";
+            return "beast.zlib error";
         }
     }
 
diff --git a/test/http/error.cpp b/test/http/error.cpp
index a8cc3477..7f9abe6f 100644
--- a/test/http/error.cpp
+++ b/test/http/error.cpp
@@ -36,24 +36,25 @@ public:
     void
     run() override
     {
-        check("http", error::end_of_stream);
-        check("http", error::partial_message);
-        check("http", error::need_more);
-        check("http", error::unexpected_body);
-        check("http", error::need_buffer);
-        check("http", error::buffer_overflow);
+        check("beast.http", error::end_of_stream);
+        check("beast.http", error::partial_message);
+        check("beast.http", error::need_more);
+        check("beast.http", error::unexpected_body);
+        check("beast.http", error::need_buffer);
+        check("beast.http", error::buffer_overflow);
 
-        check("http", error::bad_line_ending);
-        check("http", error::bad_method);
-        check("http", error::bad_path);
-        check("http", error::bad_version);
-        check("http", error::bad_status);
-        check("http", error::bad_reason);
-        check("http", error::bad_field);
-        check("http", error::bad_value);
-        check("http", error::bad_content_length);
-        check("http", error::bad_transfer_encoding);
-        check("http", error::bad_chunk);
+        check("beast.http", error::bad_line_ending);
+        check("beast.http", error::bad_method);
+        check("beast.http", error::bad_path);
+        check("beast.http", error::bad_version);
+        check("beast.http", error::bad_status);
+        check("beast.http", error::bad_reason);
+        check("beast.http", error::bad_field);
+        check("beast.http", error::bad_value);
+        check("beast.http", error::bad_content_length);
+        check("beast.http", error::bad_transfer_encoding);
+        check("beast.http", error::bad_chunk);
+        check("beast.http", error::bad_obs_fold);
     }
 };
 
diff --git a/test/websocket/error.cpp b/test/websocket/error.cpp
index 6f7f4947..3032915d 100644
--- a/test/websocket/error.cpp
+++ b/test/websocket/error.cpp
@@ -34,9 +34,9 @@ public:
 
     void run() override
     {
-        check("websocket", error::closed);
-        check("websocket", error::failed);
-        check("websocket", error::handshake_failed);
+        check("beast.websocket", error::closed);
+        check("beast.websocket", error::failed);
+        check("beast.websocket", error::handshake_failed);
     }
 };
 
diff --git a/test/zlib/error.cpp b/test/zlib/error.cpp
index 8623a38e..eb40185d 100644
--- a/test/zlib/error.cpp
+++ b/test/zlib/error.cpp
@@ -34,24 +34,24 @@ public:
 
     void run() override
     {
-        check("zlib", error::need_buffers);
-        check("zlib", error::end_of_stream);
-        check("zlib", error::stream_error);
+        check("beast.zlib", error::need_buffers);
+        check("beast.zlib", error::end_of_stream);
+        check("beast.zlib", error::stream_error);
 
-        check("zlib", error::invalid_block_type);
-        check("zlib", error::invalid_stored_length);
-        check("zlib", error::too_many_symbols);
-        check("zlib", error::invalid_code_lenths);
-        check("zlib", error::invalid_bit_length_repeat);
-        check("zlib", error::missing_eob);
-        check("zlib", error::invalid_literal_length);
-        check("zlib", error::invalid_distance_code);
-        check("zlib", error::invalid_distance);
+        check("beast.zlib", error::invalid_block_type);
+        check("beast.zlib", error::invalid_stored_length);
+        check("beast.zlib", error::too_many_symbols);
+        check("beast.zlib", error::invalid_code_lenths);
+        check("beast.zlib", error::invalid_bit_length_repeat);
+        check("beast.zlib", error::missing_eob);
+        check("beast.zlib", error::invalid_literal_length);
+        check("beast.zlib", error::invalid_distance_code);
+        check("beast.zlib", error::invalid_distance);
 
-        check("zlib", error::over_subscribed_length);
-        check("zlib", error::incomplete_length_set);
+        check("beast.zlib", error::over_subscribed_length);
+        check("beast.zlib", error::incomplete_length_set);
 
-        check("zlib", error::general);
+        check("beast.zlib", error::general);
     }
 };