diff --git a/pw_kvs/BUILD b/pw_kvs/BUILD
index 218d1992c..e08c214dd 100644
--- a/pw_kvs/BUILD
+++ b/pw_kvs/BUILD
@@ -44,8 +44,8 @@ pw_cc_library(
         "public/pw_kvs/crc16_checksum.h",
         "public/pw_kvs/flash_memory.h",
         "public/pw_kvs/format.h",
+        "public/pw_kvs/io.h",
         "public/pw_kvs/key_value_store.h",
-        "public/pw_kvs/output.h",
     ],
     includes = ["public"],
     deps = [
diff --git a/pw_kvs/BUILD.gn b/pw_kvs/BUILD.gn
index d8396b5a4..519ee3ba6 100644
--- a/pw_kvs/BUILD.gn
+++ b/pw_kvs/BUILD.gn
@@ -26,8 +26,8 @@ source_set("pw_kvs") {
     "public/pw_kvs/checksum.h",
     "public/pw_kvs/flash_memory.h",
     "public/pw_kvs/format.h",
+    "public/pw_kvs/io.h",
     "public/pw_kvs/key_value_store.h",
-    "public/pw_kvs/output.h",
   ]
   sources = [
     "alignment.cc",
diff --git a/pw_kvs/public/pw_kvs/alignment.h b/pw_kvs/public/pw_kvs/alignment.h
index 0d734d5cb..98f3d26bf 100644
--- a/pw_kvs/public/pw_kvs/alignment.h
+++ b/pw_kvs/public/pw_kvs/alignment.h
@@ -18,7 +18,7 @@
 #include <initializer_list>
 #include <utility>
 
-#include "pw_kvs/output.h"
+#include "pw_kvs/io.h"
 #include "pw_span/span.h"
 #include "pw_status/status_with_size.h"
 
diff --git a/pw_kvs/public/pw_kvs/output.h b/pw_kvs/public/pw_kvs/io.h
similarity index 100%
rename from pw_kvs/public/pw_kvs/output.h
rename to pw_kvs/public/pw_kvs/io.h