diff --git a/include/rest_rpc/rest_rpc_client.hpp b/include/rest_rpc/rpc_client.hpp
similarity index 98%
rename from include/rest_rpc/rest_rpc_client.hpp
rename to include/rest_rpc/rpc_client.hpp
index 8631561..f5c18b9 100644
--- a/include/rest_rpc/rest_rpc_client.hpp
+++ b/include/rest_rpc/rpc_client.hpp
@@ -24,9 +24,9 @@ template <> struct call_result<void> {
   rpc_errc ec;
 };
 
-class rest_rpc_client {
+class rpc_client {
 public:
-  rest_rpc_client() : socket_(get_global_executor()) {}
+  rpc_client() : socket_(get_global_executor()) {}
 
   auto get_executor() { return socket_.get_executor(); }
 
diff --git a/include/rest_rpc/rest_rpc_server.hpp b/include/rest_rpc/rpc_server.hpp
similarity index 96%
rename from include/rest_rpc/rest_rpc_server.hpp
rename to include/rest_rpc/rpc_server.hpp
index 3e6796a..a8a61c8 100644
--- a/include/rest_rpc/rest_rpc_server.hpp
+++ b/include/rest_rpc/rpc_server.hpp
@@ -6,10 +6,10 @@
 #include <string>
 #include <thread>
 namespace rest_rpc {
-class rest_rpc_server {
+class rpc_server {
 public:
-  rest_rpc_server(std::string address,
-                  size_t num_thread = std::thread::hardware_concurrency())
+  rpc_server(std::string address,
+             size_t num_thread = std::thread::hardware_concurrency())
       : io_context_pool_(num_thread),
         acceptor_(io_context_pool_.get_io_context()),
         check_timer_(io_context_pool_.get_io_context()) {
@@ -20,13 +20,13 @@ public:
     }
   }
 
-  rest_rpc_server(std::string host, std::string port,
-                  size_t num_thread = std::thread::hardware_concurrency())
+  rpc_server(std::string host, std::string port,
+             size_t num_thread = std::thread::hardware_concurrency())
       : io_context_pool_(num_thread),
         acceptor_(io_context_pool_.get_io_context()), host_(std::move(host)),
         port_(std::move(port)),
         check_timer_(io_context_pool_.get_io_context()) {}
-  ~rest_rpc_server() { stop(); }
+  ~rpc_server() { stop(); }
 
   std::error_code start() { return start_impl(false); }
 
diff --git a/tests/bench.cpp b/tests/bench.cpp
index e140de3..03b32b9 100644
--- a/tests/bench.cpp
+++ b/tests/bench.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <rest_rpc/rest_rpc_client.hpp>
-#include <rest_rpc/rest_rpc_server.hpp>
+#include <rest_rpc/rpc_client.hpp>
+#include <rest_rpc/rpc_server.hpp>
 
 using namespace rest_rpc;
 
@@ -13,7 +13,7 @@ std::string_view echo_sv(std::string_view str) {
   return str;
 }
 
-asio::awaitable<void> bench(std::shared_ptr<rest_rpc_client> cl) {
+asio::awaitable<void> bench(std::shared_ptr<rpc_client> cl) {
   co_await cl->connect(address);
   std::string_view str = "it is a test";
   while (true) {
@@ -31,7 +31,7 @@ void watch() {
 }
 
 int main(int argc, char **argv) {
-  rest_rpc_server server(address);
+  rpc_server server(address);
   server.register_handler<echo_sv>();
   if (argc == 1) {
     std::thread thd([] { watch(); });
@@ -43,9 +43,9 @@ int main(int argc, char **argv) {
   auto arg = argv[1];
   int par = atoi(arg);
 
-  std::vector<std::shared_ptr<rest_rpc_client>> clients;
+  std::vector<std::shared_ptr<rpc_client>> clients;
   for (int i = 0; i < par; i++) {
-    clients.push_back(std::make_shared<rest_rpc_client>());
+    clients.push_back(std::make_shared<rpc_client>());
   }
 
   for (size_t i = 0; i < par; i++) {
diff --git a/tests/test_rest_rpc1.cpp b/tests/test_rest_rpc1.cpp
index 019f6b5..7a1e66d 100644
--- a/tests/test_rest_rpc1.cpp
+++ b/tests/test_rest_rpc1.cpp
@@ -2,8 +2,8 @@
 
 #include "doctest/doctest.h"
 #include <asio/any_completion_handler.hpp>
-#include <rest_rpc/rest_rpc_client.hpp>
-#include <rest_rpc/rest_rpc_server.hpp>
+#include <rest_rpc/rpc_client.hpp>
+#include <rest_rpc/rpc_server.hpp>
 #include <rest_rpc/traits.h>
 
 using namespace rest_rpc;
@@ -180,7 +180,7 @@ asio::awaitable<void> void_returning_coroutine() {
 }
 
 TEST_CASE("test server start") {
-  rest_rpc_server server("127.0.0.1:9005");
+  rpc_server server("127.0.0.1:9005");
   server.register_handler<add>();
   server.register_handler<foo>();
   server.register_handler<no_arg>();
@@ -192,7 +192,7 @@ TEST_CASE("test server start") {
   server.set_check_conn_interval(std::chrono::seconds(1));
   auto ec = server.async_start();
   CHECK(!ec);
-  rest_rpc_client cl;
+  rpc_client cl;
 
   static_assert(util::CharArrayRef<char const(&)[5]>);
   static_assert(util::CharArray<const char[5]>);
@@ -254,11 +254,11 @@ TEST_CASE("test server start") {
   CHECK(ec);
   std::cout << ec.message() << "\n";
 
-  rest_rpc_server server1("127.0.0.1:9007");
+  rpc_server server1("127.0.0.1:9007");
   ec = server1.async_start();
   CHECK(!ec);
 
-  rest_rpc_server server2("127.0.0.1:9007");
+  rpc_server server2("127.0.0.1:9007");
   ec = server2.async_start();
   CHECK(ec);
   std::cout << ec.message() << "\n";
@@ -267,7 +267,7 @@ TEST_CASE("test server start") {
   std::cout << ec.message() << "\n";
 
   // if server has stopped, start server will be failed.
-  rest_rpc_server server3("127.0.0.1:9005");
+  rpc_server server3("127.0.0.1:9005");
   server3.stop();
   CHECK(server3.has_stopped());
   ec = server3.async_start();