diff --git a/CHANGELOG.md b/CHANGELOG.md
index 393b2237..b8ddc8c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Version 67:
 * Add http-server-small example
 * Merge stream_base to stream and tidy
 * Use boost::string_view
+* Rename to http-server-fast
 
 API Changes:
 
diff --git a/doc/2_examples.qbk b/doc/2_examples.qbk
index 764da173..a4b1dea0 100644
--- a/doc/2_examples.qbk
+++ b/doc/2_examples.qbk
@@ -71,8 +71,8 @@ over a TLS connection. Requires OpenSSL to build.
 This example implements a very simple HTTP server with
 some optimizations suitable for calculating benchmarks.
 
-* [repo_file example/http-server/fields_alloc.hpp]
-* [repo_file example/http-server/http_server.cpp]
+* [repo_file example/http-server-fast/fields_alloc.hpp]
+* [repo_file example/http-server-fast/http_server.cpp]
 
 [endsect]
 
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index c665a92c..e728f48b 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory (echo-op)
 add_subdirectory (http-client)
 add_subdirectory (http-crawl)
-add_subdirectory (http-server)
+add_subdirectory (http-server-fast)
 add_subdirectory (http-server-small)
 add_subdirectory (server-framework)
 add_subdirectory (websocket-client)
diff --git a/example/Jamfile b/example/Jamfile
index d1ee2ab4..be752006 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -8,7 +8,8 @@
 build-project echo-op ;
 build-project http-client ;
 build-project http-crawl ;
-build-project http-server ;
+build-project http-server-fast ;
+build-project http-server-small ;
 build-project server-framework ;
 build-project websocket-client ;
 
diff --git a/example/http-server/CMakeLists.txt b/example/http-server-fast/CMakeLists.txt
similarity index 51%
rename from example/http-server/CMakeLists.txt
rename to example/http-server-fast/CMakeLists.txt
index 93a5d4ff..f0baca67 100644
--- a/example/http-server/CMakeLists.txt
+++ b/example/http-server-fast/CMakeLists.txt
@@ -2,15 +2,15 @@
 
 GroupSources(include/beast beast)
 
-GroupSources(example/http-server "/")
+GroupSources(example/http-server-fast "/")
 
-add_executable (http-server
+add_executable (http-server-fast
     ${BEAST_INCLUDES}
     fields_alloc.hpp
-    http_server.cpp
+    http_server_fast.cpp
 )
 
-target_link_libraries(http-server
+target_link_libraries(http-server-fast
     Beast
     ${Boost_FILESYSTEM_LIBRARY}
     )
diff --git a/example/http-server/Jamfile b/example/http-server-fast/Jamfile
similarity index 86%
rename from example/http-server/Jamfile
rename to example/http-server-fast/Jamfile
index 2b18598b..3285b7ac 100644
--- a/example/http-server/Jamfile
+++ b/example/http-server-fast/Jamfile
@@ -5,8 +5,8 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-exe http-server :
-    http_server.cpp
+exe http-server-fast :
+    http_server_fast.cpp
     :
     <variant>coverage:<build>no
     <variant>ubasan:<build>no
diff --git a/example/http-server/fields_alloc.hpp b/example/http-server-fast/fields_alloc.hpp
similarity index 100%
rename from example/http-server/fields_alloc.hpp
rename to example/http-server-fast/fields_alloc.hpp
diff --git a/example/http-server/http_server.cpp b/example/http-server-fast/http_server_fast.cpp
similarity index 100%
rename from example/http-server/http_server.cpp
rename to example/http-server-fast/http_server_fast.cpp