diff --git a/contrib/cmake/lib/CMakeLists.txt b/contrib/cmake/lib/CMakeLists.txt
index 4294a59e..bb2c0575 100644
--- a/contrib/cmake/lib/CMakeLists.txt
+++ b/contrib/cmake/lib/CMakeLists.txt
@@ -60,14 +60,13 @@ SET(Sources
         ${LIBRARY_DIR}/divsufsort.c
         ${LIBRARY_DIR}/fse.c
         ${LIBRARY_DIR}/huff0.c
+        ${LIBRARY_DIR}/zbuff.c
         ${LIBRARY_DIR}/zdict.c
-        ${LIBRARY_DIR}/zstd_buffered.c
         ${LIBRARY_DIR}/zstd_compress.c
         ${LIBRARY_DIR}/zstd_decompress.c)
 
 SET(Headers
         ${LIBRARY_DIR}/bitstream.h
-        ${LIBRARY_DIR}/zdict.h
         ${LIBRARY_DIR}/error_private.h
         ${LIBRARY_DIR}/error_public.h
         ${LIBRARY_DIR}/fse.h
@@ -75,8 +74,10 @@ SET(Headers
         ${LIBRARY_DIR}/huff0.h
         ${LIBRARY_DIR}/huff0_static.h
         ${LIBRARY_DIR}/mem.h
-        ${LIBRARY_DIR}/zstd_buffered_static.h
-        ${LIBRARY_DIR}/zstd_buffered.h
+        ${LIBRARY_DIR}/zbuff.h
+        ${LIBRARY_DIR}/zbuff_static.h
+        ${LIBRARY_DIR}/zdict.h
+        ${LIBRARY_DIR}/zdict_static.h
         ${LIBRARY_DIR}/zstd_internal.h
         ${LIBRARY_DIR}/zstd_static.h
         ${LIBRARY_DIR}/zstd.h)
diff --git a/lib/zstd_buffered.c b/lib/zbuff.c
similarity index 99%
rename from lib/zstd_buffered.c
rename to lib/zbuff.c
index 133c54e1..4c1eb2cf 100644
--- a/lib/zstd_buffered.c
+++ b/lib/zbuff.c
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include "error_private.h"
 #include "zstd_static.h"
-#include "zstd_buffered_static.h"
+#include "zbuff_static.h"
 
 
 /* *************************************
diff --git a/lib/zstd_buffered.h b/lib/zbuff.h
similarity index 100%
rename from lib/zstd_buffered.h
rename to lib/zbuff.h
diff --git a/lib/zstd_buffered_static.h b/lib/zbuff_static.h
similarity index 98%
rename from lib/zstd_buffered_static.h
rename to lib/zbuff_static.h
index a15745c0..40550890 100644
--- a/lib/zstd_buffered_static.h
+++ b/lib/zbuff_static.h
@@ -45,7 +45,7 @@ extern "C" {
 *  Includes
 ***************************************/
 #include "zstd_static.h"     /* ZSTD_parameters */
-#include "zstd_buffered.h"
+#include "zbuff.h"
 
 
 /* *************************************
diff --git a/programs/Makefile b/programs/Makefile
index e96a0dd2..7da0cc61 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -84,11 +84,11 @@ default: zstd
 
 all: zstd zstd32 fullbench fullbench32 fuzzer fuzzer32 zbufftest zbufftest32 paramgrill datagen
 
-zstd  : $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zstd_buffered.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \
+zstd  : $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zbuff.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \
         zstdcli.c fileio.c bench.c xxhash.c datagen.c dibio.c
 	$(CC)      $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT)
 
-zstd32: $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zstd_buffered.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \
+zstd32: $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zbuff.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \
         zstdcli.c fileio.c bench.c xxhash.c datagen.c dibio.c 
 	$(CC) -m32 $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT)
 
@@ -123,11 +123,11 @@ fuzzer32: $(ZSTD_FILES) \
       datagen.c xxhash.c fuzzer.c
 	$(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
 
-zbufftest  : $(ZSTD_FILES) $(ZSTDDIR)/zstd_buffered.c \
+zbufftest  : $(ZSTD_FILES) $(ZSTDDIR)/zbuff.c \
       datagen.c xxhash.c zbufftest.c
 	$(CC)      $(FLAGS) $^ -o $@$(EXT)
 
-zbufftest32: $(ZSTD_FILES) $(ZSTDDIR)/zstd_buffered.c \
+zbufftest32: $(ZSTD_FILES) $(ZSTDDIR)/zbuff.c \
       datagen.c xxhash.c zbufftest.c
 	$(CC) -m32 $(FLAGS) $^ -o $@$(EXT)
 
diff --git a/programs/fileio.c b/programs/fileio.c
index ea6e866c..898f4720 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -65,7 +65,7 @@
 #include "mem.h"
 #include "fileio.h"
 #include "zstd_static.h"   /* ZSTD_magicNumber */
-#include "zstd_buffered_static.h"
+#include "zbuff_static.h"
 
 #if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT==1)
 #  include "zstd_legacy.h"    /* legacy */
diff --git a/programs/zbufftest.c b/programs/zbufftest.c
index a8257dfc..aa57b576 100644
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@ -41,7 +41,7 @@
 #include <sys/timeb.h>   /* timeb */
 #include <string.h>      /* strcmp */
 #include "mem.h"
-#include "zstd_buffered.h"
+#include "zbuff.h"
 #include "zstd.h"        /* ZSTD_compressBound() */
 #include "datagen.h"     /* RDG_genBuffer */
 #include "xxhash.h"      /* XXH64 */