diff --git a/CMakeLists.txt b/CMakeLists.txt
index d436e88..1fd9a7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ add_subdirectory(
 
 add_subdirectory("core-buffer")
 add_subdirectory("jf-udp-recv")
-add_subdirectory("sf-buffer-writer")
+add_subdirectory("jf-buffer-writer")
 add_subdirectory("sf-stream")
 add_subdirectory("sf-writer")
 #add_subdirectory("jf-live-writer")
diff --git a/jf-buffer-writer/CMakeLists.txt b/jf-buffer-writer/CMakeLists.txt
new file mode 100644
index 0000000..a389502
--- /dev/null
+++ b/jf-buffer-writer/CMakeLists.txt
@@ -0,0 +1,18 @@
+file(GLOB SOURCES
+        src/*.cpp)
+
+add_library(jf-buffer-writer-lib STATIC ${SOURCES})
+target_include_directories(jf-buffer-writer-lib PUBLIC include/)
+target_link_libraries(jf-buffer-writer-lib
+        external
+        core-buffer-lib)
+
+add_executable(jf-buffer-writer src/main.cpp)
+set_target_properties(jf-buffer-writer PROPERTIES OUTPUT_NAME jf_buffer_writer)
+target_link_libraries(jf-buffer-writer
+        jf-buffer-writer-lib
+        zmq
+        rt)
+
+enable_testing()
+add_subdirectory(test/)
diff --git a/sf-buffer-writer/include/BufferBinaryWriter.hpp b/jf-buffer-writer/include/BufferBinaryWriter.hpp
similarity index 100%
rename from sf-buffer-writer/include/BufferBinaryWriter.hpp
rename to jf-buffer-writer/include/BufferBinaryWriter.hpp
diff --git a/sf-buffer-writer/include/BufferStats.hpp b/jf-buffer-writer/include/BufferStats.hpp
similarity index 100%
rename from sf-buffer-writer/include/BufferStats.hpp
rename to jf-buffer-writer/include/BufferStats.hpp
diff --git a/sf-buffer-writer/src/BufferBinaryWriter.cpp b/jf-buffer-writer/src/BufferBinaryWriter.cpp
similarity index 100%
rename from sf-buffer-writer/src/BufferBinaryWriter.cpp
rename to jf-buffer-writer/src/BufferBinaryWriter.cpp
diff --git a/sf-buffer-writer/src/BufferStats.cpp b/jf-buffer-writer/src/BufferStats.cpp
similarity index 100%
rename from sf-buffer-writer/src/BufferStats.cpp
rename to jf-buffer-writer/src/BufferStats.cpp
diff --git a/sf-buffer-writer/src/main.cpp b/jf-buffer-writer/src/main.cpp
similarity index 100%
rename from sf-buffer-writer/src/main.cpp
rename to jf-buffer-writer/src/main.cpp
diff --git a/jf-buffer-writer/test/CMakeLists.txt b/jf-buffer-writer/test/CMakeLists.txt
new file mode 100644
index 0000000..4e32fd8
--- /dev/null
+++ b/jf-buffer-writer/test/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_executable(jf-buffer-writer-tests main.cpp)
+
+target_link_libraries(jf-buffer-writer-tests
+        jf-buffer-writer-lib
+        zmq
+        gtest
+        )
diff --git a/sf-buffer-writer/test/main.cpp b/jf-buffer-writer/test/main.cpp
similarity index 100%
rename from sf-buffer-writer/test/main.cpp
rename to jf-buffer-writer/test/main.cpp
diff --git a/sf-buffer-writer/test/test_BufferBinaryWriter.cpp b/jf-buffer-writer/test/test_BufferBinaryWriter.cpp
similarity index 100%
rename from sf-buffer-writer/test/test_BufferBinaryWriter.cpp
rename to jf-buffer-writer/test/test_BufferBinaryWriter.cpp
diff --git a/sf-buffer-writer/CMakeLists.txt b/sf-buffer-writer/CMakeLists.txt
deleted file mode 100644
index 636556d..0000000
--- a/sf-buffer-writer/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-file(GLOB SOURCES
-        src/*.cpp)
-
-add_library(sf-buffer-writer-lib STATIC ${SOURCES})
-target_include_directories(sf-buffer-writer-lib PUBLIC include/)
-target_link_libraries(sf-buffer-writer-lib
-        external
-        core-buffer-lib)
-
-add_executable(sf-buffer-writer src/main.cpp)
-set_target_properties(sf-buffer-writer PROPERTIES OUTPUT_NAME sf_buffer)
-target_link_libraries(sf-buffer-writer
-        sf-buffer-writer-lib
-        zmq
-        rt)
-
-enable_testing()
-add_subdirectory(test/)
diff --git a/sf-buffer-writer/test/CMakeLists.txt b/sf-buffer-writer/test/CMakeLists.txt
deleted file mode 100644
index 7d1417c..0000000
--- a/sf-buffer-writer/test/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable(sf-buffer-writer-tests main.cpp)
-
-target_link_libraries(sf-buffer-writer-tests
-        sf-buffer-writer-lib
-        zmq
-        gtest
-        )