diff --git a/doc/libvips-docs.xml.in b/doc/libvips-docs.xml.in
index f151e43c..6bcd510b 100644
--- a/doc/libvips-docs.xml.in
+++ b/doc/libvips-docs.xml.in
@@ -62,7 +62,7 @@
     <xi:include href="xml/threadpool.xml"/>
     <xi:include href="xml/buf.xml"/>
     <xi:include href="xml/connection.xml"/>
-    <xi:include href="xml/bufis.xml"/>
+    <xi:include href="xml/sbuf.xml"/>
     <xi:include href="xml/basic.xml"/>
   </chapter>
 
diff --git a/libvips/include/vips/Makefile.am b/libvips/include/vips/Makefile.am
index 4cc05269..63477381 100644
--- a/libvips/include/vips/Makefile.am
+++ b/libvips/include/vips/Makefile.am
@@ -1,6 +1,6 @@
 pkginclude_HEADERS = \
 	connection.h \
-	bufis.h \
+	sbuf.h \
 	basic.h \
 	type.h \
 	gate.h \
diff --git a/libvips/include/vips/bufis.h b/libvips/include/vips/sbuf.h
similarity index 100%
rename from libvips/include/vips/bufis.h
rename to libvips/include/vips/sbuf.h
diff --git a/libvips/include/vips/vips.h b/libvips/include/vips/vips.h
index 3d6751ae..88532641 100644
--- a/libvips/include/vips/vips.h
+++ b/libvips/include/vips/vips.h
@@ -114,7 +114,7 @@ extern "C" {
 #include <vips/type.h>
 #include <vips/gate.h>
 #include <vips/connection.h>
-#include <vips/bufis.h>
+#include <vips/sbuf.h>
 
 #include <vips/version.h>
 #include <vips/rect.h>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index def0d58e..392ed77e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -244,20 +244,20 @@ libvips/histogram/hist_unary.c
 libvips/histogram/case.c
 libvips/histogram/hist_local.c
 libvips/introspect.c
-libvips/iofuncs/streamo.c
+libvips/iofuncs/target.c
 libvips/iofuncs/sinkscreen.c
 libvips/iofuncs/vipsmarshal.c
 libvips/iofuncs/init.c
 libvips/iofuncs/dbuf.c
 libvips/iofuncs/buffer.c
 libvips/iofuncs/operation.c
-libvips/iofuncs/bufis.c
+libvips/iofuncs/sbuf.c
 libvips/iofuncs/sinkmemory.c
 libvips/iofuncs/window.c
 libvips/iofuncs/reorder.c
-libvips/iofuncs/streamou.c
+libvips/iofuncs/targetcustom.c
 libvips/iofuncs/base64.c
-libvips/iofuncs/streami.c
+libvips/iofuncs/source.c
 libvips/iofuncs/memory.c
 libvips/iofuncs/sinkdisc.c
 libvips/iofuncs/region.c
@@ -268,7 +268,7 @@ libvips/iofuncs/cache.c
 libvips/iofuncs/type.c
 libvips/iofuncs/semaphore.c
 libvips/iofuncs/gate.c
-libvips/iofuncs/streamiu.c
+libvips/iofuncs/sourcecustom.c
 libvips/iofuncs/mapfile.c
 libvips/iofuncs/sink.c
 libvips/iofuncs/enumtypes.c
@@ -277,7 +277,7 @@ libvips/iofuncs/header.c
 libvips/iofuncs/error.c
 libvips/iofuncs/generate.c
 libvips/iofuncs/image.c
-libvips/iofuncs/stream.c
+libvips/iofuncs/connection.c
 libvips/iofuncs/threadpool.c
 libvips/iofuncs/buf.c
 libvips/iofuncs/system.c
@@ -326,7 +326,7 @@ tools/vipsheader.c
 tools/vipsthumbnail.c
 cplusplus/include/vips/VError8.h
 cplusplus/include/vips/vips-operators.h
-cplusplus/include/vips/VStream8.h
+cplusplus/include/vips/VConnection8.h
 cplusplus/include/vips/VImage8.h
 cplusplus/include/vips/VInterpolate8.h
 libvips/arithmetic/binary.h
@@ -380,8 +380,8 @@ libvips/include/vips/vector.h
 libvips/include/vips/cimg_funcs.h
 libvips/include/vips/dbuf.h
 libvips/include/vips/error.h
-libvips/include/vips/stream.h
-libvips/include/vips/bufis.h
+libvips/include/vips/connection.h
+libvips/include/vips/sbuf.h
 libvips/include/vips/type.h
 libvips/include/vips/create.h
 libvips/include/vips/generate.h
@@ -426,7 +426,7 @@ cplusplus/VError.cpp
 cplusplus/VImage.cpp
 cplusplus/VInterpolate.cpp
 cplusplus/vips-operators.cpp
-cplusplus/VStream.cpp
+cplusplus/VConnection.cpp
 libvips/conversion/composite.cpp
 libvips/resample/reduceh.cpp
 libvips/resample/vsqbs.cpp