diff --git a/example/hello_world_in_coro_multithreaded_env.cpp b/example/hello_world_in_coro_multithreaded_env.cpp
index ab05386..9929ef3 100644
--- a/example/hello_world_in_coro_multithreaded_env.cpp
+++ b/example/hello_world_in_coro_multithreaded_env.cpp
@@ -30,7 +30,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 // client_type with logging enabled
@@ -59,7 +59,7 @@ boost::asio::awaitable<void> publish_hello_world(
         .async_run(boost::asio::detached); // Start the Client.
 
     auto&& [ec, rc, puback_props] = co_await client.async_publish<boost::mqtt5::qos_e::at_least_once>(
-        "async-mqtt5/test" /* topic */, "Hello world!" /* payload*/, boost::mqtt5::retain_e::no,
+        "boost-mqtt5/test" /* topic */, "Hello world!" /* payload*/, boost::mqtt5::retain_e::no,
         boost::mqtt5::publish_props {}, use_nothrow_awaitable);
 
     co_await client.async_disconnect(use_nothrow_awaitable);
diff --git a/example/hello_world_in_multithreaded_env.cpp b/example/hello_world_in_multithreaded_env.cpp
index 102a80d..898c588 100644
--- a/example/hello_world_in_multithreaded_env.cpp
+++ b/example/hello_world_in_multithreaded_env.cpp
@@ -27,7 +27,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 int main(int argc, char** argv) {
@@ -78,7 +78,7 @@ int main(int argc, char** argv) {
                 assert(strand.running_in_this_thread());
 
                 client.async_publish<boost::mqtt5::qos_e::at_least_once>(
-                    "async-mqtt5/test", "Hello World!", boost::mqtt5::retain_e::no,
+                    "boost-mqtt5/test", "Hello World!", boost::mqtt5::retain_e::no,
                     boost::mqtt5::publish_props {},
                     // You may bind the strand to this handler, but it is not necessary
                     // as the strand is already the default associated handler.
diff --git a/example/hello_world_over_tcp.cpp b/example/hello_world_over_tcp.cpp
index b83d226..074f7b4 100644
--- a/example/hello_world_over_tcp.cpp
+++ b/example/hello_world_over_tcp.cpp
@@ -20,7 +20,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883; // 1883 is the default TCP MQTT port.
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 int main(int argc, char** argv) {
@@ -53,7 +53,7 @@ int main(int argc, char** argv) {
 
     //[publish_hello_world
     client.async_publish<boost::mqtt5::qos_e::at_most_once>(
-        "async-mqtt5/test", "Hello world!",
+        "boost-mqtt5/test", "Hello world!",
         boost::mqtt5::retain_e::yes, boost::mqtt5::publish_props {},
         [&client](boost::mqtt5::error_code ec) {
             std::cout << ec.message() << std::endl;
diff --git a/example/hello_world_over_tls.cpp b/example/hello_world_over_tls.cpp
index cd46e32..8794677 100644
--- a/example/hello_world_over_tls.cpp
+++ b/example/hello_world_over_tls.cpp
@@ -22,7 +22,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 8883; // 8883 is the default TLS MQTT port.
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 // External customization point.
@@ -89,7 +89,7 @@ int main(int argc, char** argv) {
         .async_run(boost::asio::detached); // Start the Client.
 
     client.async_publish<boost::mqtt5::qos_e::at_most_once>(
-        "async-mqtt5/test", "Hello world!",
+        "boost-mqtt5/test", "Hello world!",
         boost::mqtt5::retain_e::no, boost::mqtt5::publish_props{},
         [&client](boost::mqtt5::error_code ec) {
             std::cout << ec.message() << std::endl;
diff --git a/example/hello_world_over_websocket_tcp.cpp b/example/hello_world_over_websocket_tcp.cpp
index 7d27379..e35742a 100644
--- a/example/hello_world_over_websocket_tcp.cpp
+++ b/example/hello_world_over_websocket_tcp.cpp
@@ -22,7 +22,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com/mqtt"; // Path example: localhost/mqtt
     uint16_t port = 8000; // 8083 is the default Webscoket/TCP MQTT port. However, HiveMQ's public broker uses 8000 instead.
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 int main(int argc, char** argv) {
@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
         .async_run(boost::asio::detached); // Start the Client.
 
     client.async_publish<boost::mqtt5::qos_e::at_most_once>(
-        "async-mqtt5/test", "Hello world!",
+        "boost-mqtt5/test", "Hello world!",
         boost::mqtt5::retain_e::no, boost::mqtt5::publish_props {},
         [&client](boost::mqtt5::error_code ec) {
             std::cout << ec.message() << std::endl;
diff --git a/example/hello_world_over_websocket_tls.cpp b/example/hello_world_over_websocket_tls.cpp
index c2d0c40..d7e04b4 100644
--- a/example/hello_world_over_websocket_tls.cpp
+++ b/example/hello_world_over_websocket_tls.cpp
@@ -23,7 +23,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com/mqtt"; // Path example: localhost/mqtt
     uint16_t port = 8884; // 8884 is the default Websocket/TLS MQTT port.
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 // External customization point.
@@ -88,7 +88,7 @@ int main(int argc, char** argv) {
         .async_run(boost::asio::detached); // Start the Client.
 
     client.async_publish<boost::mqtt5::qos_e::at_most_once>(
-        "async-mqtt5/test", "Hello world!",
+        "boost-mqtt5/test", "Hello world!",
         boost::mqtt5::retain_e::no, boost::mqtt5::publish_props{},
         [&client](boost::mqtt5::error_code ec) {
             std::cout << ec.message() << std::endl;
diff --git a/example/multiflight_client.cpp b/example/multiflight_client.cpp
index 0e093ef..f7eef4a 100644
--- a/example/multiflight_client.cpp
+++ b/example/multiflight_client.cpp
@@ -22,7 +22,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 int main(int argc, char** argv) {
@@ -50,7 +50,7 @@ int main(int argc, char** argv) {
     // of the previous async_publish call to be invoked.
     for (auto i = 1; i <= 5; ++i)
         client.async_publish<boost::mqtt5::qos_e::exactly_once>(
-            "async-mqtt5/test", "Hello world!",
+            "boost-mqtt5/test", "Hello world!",
             boost::mqtt5::retain_e::no, boost::mqtt5::publish_props {},
             [i](boost::mqtt5::error_code ec, boost::mqtt5::reason_code rc, boost::mqtt5::pubcomp_props) {
                 std::cout << "Publish number " << i << " completed with: " << std::endl;
diff --git a/example/publisher.cpp b/example/publisher.cpp
index 232a2b9..df9aaba 100644
--- a/example/publisher.cpp
+++ b/example/publisher.cpp
@@ -31,7 +31,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 // Modified completion token that will prevent co_await from throwing exceptions.
@@ -65,7 +65,7 @@ boost::asio::awaitable<void> publish_sensor_readings(
 
         // Publish the sensor reading with QoS 1.
         auto&& [ec, rc, props] = co_await client.async_publish<boost::mqtt5::qos_e::at_least_once>(
-            "async-mqtt5/test" /* topic */, reading /* payload */,
+            "boost-mqtt5/test" /* topic */, reading /* payload */,
             boost::mqtt5::retain_e::no, boost::mqtt5::publish_props {}, use_nothrow_awaitable
         );
         // An error can occur as a result of:
diff --git a/example/receiver.cpp b/example/receiver.cpp
index 8942e99..e1c1611 100644
--- a/example/receiver.cpp
+++ b/example/receiver.cpp
@@ -29,7 +29,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 // Modified completion token that will prevent co_await from throwing exceptions.
diff --git a/example/timeout_with_awaitable_operators.cpp b/example/timeout_with_awaitable_operators.cpp
index 04f30fd..3b8f5a6 100644
--- a/example/timeout_with_awaitable_operators.cpp
+++ b/example/timeout_with_awaitable_operators.cpp
@@ -32,7 +32,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 // Modified completion token that will prevent co_await from throwing exceptions.
@@ -54,7 +54,7 @@ boost::asio::awaitable<void> send_over_mqtt(
         .async_run(boost::asio::detached); // Start the Client.
 
     auto&& [pec, prc, puback_props] = co_await client.async_publish<boost::mqtt5::qos_e::at_least_once>(
-        "async-mqtt5/test", "Hello World!",
+        "boost-mqtt5/test", "Hello World!",
         boost::mqtt5::retain_e::no, boost::mqtt5::publish_props {},
         use_nothrow_awaitable
     );
diff --git a/example/timeout_with_parallel_group.cpp b/example/timeout_with_parallel_group.cpp
index ddb5707..b66ee1a 100644
--- a/example/timeout_with_parallel_group.cpp
+++ b/example/timeout_with_parallel_group.cpp
@@ -27,7 +27,7 @@
 struct config {
     std::string brokers = "broker.hivemq.com";
     uint16_t port = 1883;
-    std::string client_id = "async_mqtt5_tester";
+    std::string client_id = "boost_mqtt5_tester";
 };
 
 int main(int argc, char** argv) {
diff --git a/test/integration/mqtt_features.cpp b/test/integration/mqtt_features.cpp
index 466703b..c8f98f3 100644
--- a/test/integration/mqtt_features.cpp
+++ b/test/integration/mqtt_features.cpp
@@ -40,9 +40,9 @@ using stream_type = asio::ip::tcp::socket;
 
 constexpr auto broker = "broker.hivemq.com";
 constexpr auto connect_wait_dur = std::chrono::milliseconds(200);
-constexpr auto topic = "async-mqtt5/test";
-constexpr auto share_topic = "$share/sharename/async-mqtt5/test";
-constexpr auto payload = "hello from async-mqtt5";
+constexpr auto topic = "boost-mqtt5/test";
+constexpr auto share_topic = "$share/sharename/boost-mqtt5/test";
+constexpr auto payload = "hello from boost-mqtt5";
 
 template <typename TestCase>
 void run_test(TestCase&& test_case) {