diff --git a/pw_rpc/BUILD.bazel b/pw_rpc/BUILD.bazel
index 30759ca..b47f0a9 100644
--- a/pw_rpc/BUILD.bazel
+++ b/pw_rpc/BUILD.bazel
@@ -44,8 +44,8 @@
 pw_cc_library(
     name = "server",
     srcs = [
-        "base_server_writer.cc",
-        "public/pw_rpc/internal/base_server_writer.h",
+        "responder.cc",
+        "public/pw_rpc/internal/responder.h",
         "public/pw_rpc/internal/call.h",
         "public/pw_rpc/internal/hash.h",
         "public/pw_rpc/internal/method.h",
@@ -160,7 +160,7 @@
 pw_cc_test(
     name = "base_server_writer_test",
     srcs = [
-        "base_server_writer_test.cc",
+        "responder_test.cc",
     ],
     deps = [
         ":internal_test_utils",
diff --git a/pw_rpc/BUILD.gn b/pw_rpc/BUILD.gn
index bc82b77..a1efb04 100644
--- a/pw_rpc/BUILD.gn
+++ b/pw_rpc/BUILD.gn
@@ -54,14 +54,14 @@
     "public/pw_rpc/service.h",
   ]
   sources = [
-    "base_server_writer.cc",
-    "public/pw_rpc/internal/base_server_writer.h",
     "public/pw_rpc/internal/call.h",
     "public/pw_rpc/internal/hash.h",
     "public/pw_rpc/internal/method.h",
     "public/pw_rpc/internal/method_lookup.h",
     "public/pw_rpc/internal/method_union.h",
+    "public/pw_rpc/internal/responder.h",
     "public/pw_rpc/internal/server.h",
+    "responder.cc",
     "server.cc",
     "service.cc",
   ]
@@ -217,7 +217,7 @@
     ":server",
     ":test_utils",
   ]
-  sources = [ "base_server_writer_test.cc" ]
+  sources = [ "responder_test.cc" ]
 }
 
 pw_test("channel_test") {
diff --git a/pw_rpc/CMakeLists.txt b/pw_rpc/CMakeLists.txt
index c3635fe..4a34370 100644
--- a/pw_rpc/CMakeLists.txt
+++ b/pw_rpc/CMakeLists.txt
@@ -24,7 +24,7 @@
 
 pw_add_module_library(pw_rpc.server
   SOURCES
-    base_server_writer.cc
+    responder.cc
     server.cc
     service.cc
   PUBLIC_DEPS
diff --git a/pw_rpc/nanopb/public/pw_rpc/internal/nanopb_method.h b/pw_rpc/nanopb/public/pw_rpc/internal/nanopb_method.h
index 80b5864..1eae0b0 100644
--- a/pw_rpc/nanopb/public/pw_rpc/internal/nanopb_method.h
+++ b/pw_rpc/nanopb/public/pw_rpc/internal/nanopb_method.h
@@ -19,11 +19,11 @@
 #include <span>
 #include <type_traits>
 
-#include "pw_rpc/internal/base_server_writer.h"
 #include "pw_rpc/internal/config.h"
 #include "pw_rpc/internal/method.h"
 #include "pw_rpc/internal/method_type.h"
 #include "pw_rpc/internal/nanopb_common.h"
+#include "pw_rpc/internal/responder.h"
 #include "pw_rpc/server_context.h"
 #include "pw_status/status.h"
 #include "pw_status/status_with_size.h"
diff --git a/pw_rpc/public/pw_rpc/internal/base_server_writer.h b/pw_rpc/public/pw_rpc/internal/responder.h
similarity index 100%
rename from pw_rpc/public/pw_rpc/internal/base_server_writer.h
rename to pw_rpc/public/pw_rpc/internal/responder.h
diff --git a/pw_rpc/public/pw_rpc/server.h b/pw_rpc/public/pw_rpc/server.h
index b57e1cb..98fc2df 100644
--- a/pw_rpc/public/pw_rpc/server.h
+++ b/pw_rpc/public/pw_rpc/server.h
@@ -19,9 +19,9 @@
 
 #include "pw_containers/intrusive_list.h"
 #include "pw_rpc/channel.h"
-#include "pw_rpc/internal/base_server_writer.h"
 #include "pw_rpc/internal/channel.h"
 #include "pw_rpc/internal/method.h"
+#include "pw_rpc/internal/responder.h"
 #include "pw_rpc/service.h"
 #include "pw_status/status.h"
 
diff --git a/pw_rpc/raw/public/pw_rpc/internal/raw_method.h b/pw_rpc/raw/public/pw_rpc/internal/raw_method.h
index 768238d..7d86ebe 100644
--- a/pw_rpc/raw/public/pw_rpc/internal/raw_method.h
+++ b/pw_rpc/raw/public/pw_rpc/internal/raw_method.h
@@ -14,9 +14,9 @@
 #pragma once
 
 #include "pw_bytes/span.h"
-#include "pw_rpc/internal/base_server_writer.h"
 #include "pw_rpc/internal/method.h"
 #include "pw_rpc/internal/method_type.h"
+#include "pw_rpc/internal/responder.h"
 #include "pw_status/status_with_size.h"
 
 namespace pw::rpc {
diff --git a/pw_rpc/base_server_writer.cc b/pw_rpc/responder.cc
similarity index 98%
rename from pw_rpc/base_server_writer.cc
rename to pw_rpc/responder.cc
index d1a51b7..1c20e8c 100644
--- a/pw_rpc/base_server_writer.cc
+++ b/pw_rpc/responder.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_rpc/internal/base_server_writer.h"
+#include "pw_rpc/internal/responder.h"
 
 #include "pw_assert/check.h"
 #include "pw_rpc/internal/method.h"
diff --git a/pw_rpc/base_server_writer_test.cc b/pw_rpc/responder_test.cc
similarity index 98%
rename from pw_rpc/base_server_writer_test.cc
rename to pw_rpc/responder_test.cc
index d9812ba..28b4910 100644
--- a/pw_rpc/base_server_writer_test.cc
+++ b/pw_rpc/responder_test.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "pw_rpc/internal/base_server_writer.h"
+#include "pw_rpc/internal/responder.h"
 
 #include <algorithm>
 #include <array>