diff --git a/src/modules/_Stdio/buffer.cmod b/src/modules/_Stdio/buffer.cmod
index fbe6ab2d9d6dc41737a3189ada2ddd6769b15557..2e2cf3403a0709ce21a2bdea21308420766ffdb2 100644
--- a/src/modules/_Stdio/buffer.cmod
+++ b/src/modules/_Stdio/buffer.cmod
@@ -16,7 +16,7 @@
 #include "whitespace.h"
 #include "pike_types.h"
 #include "pike_threadlib.h"
-#include "iobuffer.h"
+#include "buffer.h"
 #include "module_support.h"
 
 #include <arpa/inet.h>
diff --git a/src/modules/_Stdio/iobuffer.h b/src/modules/_Stdio/buffer.h
similarity index 100%
rename from src/modules/_Stdio/iobuffer.h
rename to src/modules/_Stdio/buffer.h
diff --git a/src/modules/_Stdio/file.c b/src/modules/_Stdio/file.c
index e990da054ba2718db3b63293a13882075b1c69f1..cb0dae800faa30b4bda0c4afd90aa410f8199d0a 100644
--- a/src/modules/_Stdio/file.c
+++ b/src/modules/_Stdio/file.c
@@ -24,7 +24,7 @@
 #include "builtin_functions.h"
 #include "gc.h"
 #include "time_stuff.h"
-#include "iobuffer.h"
+#include "buffer.h"
 #include "file_machine.h"
 #include "file.h"
 #include "pike_error.h"
diff --git a/src/modules/_Stdio/testsuite.in b/src/modules/_Stdio/testsuite.in
index 6214418893fd7621a0178bc8f4ac0367730f88b8..81d9103eeffa14c1fccd3b82f690fd017b4d3efd 100644
--- a/src/modules/_Stdio/testsuite.in
+++ b/src/modules/_Stdio/testsuite.in
@@ -449,7 +449,7 @@ test_any([[
  return 1;
 ]], 1)
 
-dnl create/add( iobuffer )
+dnl create/add( buffer )
 test_any([[
   Stdio.Buffer a = Stdio.Buffer("buffer 1");
   Stdio.Buffer b = Stdio.Buffer("buffer 2");
diff --git a/src/object.c b/src/object.c
index 45e5c6125a6b8e07ebf42147fa73903b55ae9aaf..43b15e052ed56f647f8944c71080f904e05d485c 100644
--- a/src/object.c
+++ b/src/object.c
@@ -3294,7 +3294,7 @@ static struct string_builder *string_buffer(struct object *o)
   return get_storage( o, sbuf_program );
 }
 
-#include "modules/_Stdio/iobuffer.h"
+#include "modules/_Stdio/buffer.h"
 
 static Buffer *io_buffer(struct object *o)
 {