diff --git a/core-buffer/include/SFWriter.hpp b/core-buffer/include/WriterH5Writer.hpp
similarity index 93%
rename from core-buffer/include/SFWriter.hpp
rename to core-buffer/include/WriterH5Writer.hpp
index 09adbe1..353a78a 100644
--- a/core-buffer/include/SFWriter.hpp
+++ b/core-buffer/include/WriterH5Writer.hpp
@@ -15,7 +15,7 @@ struct DetectorFrame
     bool     is_good_frame[core_buffer::WRITER_N_FRAMES_BUFFER];
 };
 
-class SFWriter {
+class WriterH5Writer {
 
     const size_t n_frames_;
     const size_t n_modules_;
@@ -30,11 +30,11 @@ class SFWriter {
     H5::DataSet n_received_packets_dataset_;
 
 public:
-    SFWriter(
+    WriterH5Writer(
             const std::string& output_file,
             const size_t n_frames,
             const size_t n_modules);
-    ~SFWriter();
+    ~WriterH5Writer();
     void write(const DetectorFrame* metadata, const char* data);
     void close_file();
 };
diff --git a/core-buffer/src/FastQueue.cpp b/core-buffer/src/FastQueue.cpp
index da70f25..146f5ed 100644
--- a/core-buffer/src/FastQueue.cpp
+++ b/core-buffer/src/FastQueue.cpp
@@ -1,5 +1,5 @@
 #include <stdexcept>
-#include <SFWriter.hpp>
+#include <WriterH5Writer.hpp>
 #include <jungfrau.hpp>
 #include "FastQueue.hpp"
 
diff --git a/core-buffer/src/SFWriter.cpp b/core-buffer/src/WriterH5Writer.cpp
similarity index 95%
rename from core-buffer/src/SFWriter.cpp
rename to core-buffer/src/WriterH5Writer.cpp
index 5e9f804..d7cb893 100644
--- a/core-buffer/src/SFWriter.cpp
+++ b/core-buffer/src/WriterH5Writer.cpp
@@ -1,4 +1,4 @@
-#include "SFWriter.hpp"
+#include "WriterH5Writer.hpp"
 #include <sstream>
 #include "date.h"
 
@@ -10,7 +10,7 @@ extern "C"
 using namespace std;
 using namespace core_buffer;
 
-SFWriter::SFWriter(
+WriterH5Writer::WriterH5Writer(
         const string& output_file,
         const size_t n_frames,
         const size_t n_modules) :
@@ -68,12 +68,12 @@ SFWriter::SFWriter(
             metadata_dataset_properties);
 }
 
-SFWriter::~SFWriter()
+WriterH5Writer::~WriterH5Writer()
 {
     close_file();
 }
 
-void SFWriter::close_file()
+void WriterH5Writer::close_file()
 {
     image_dataset_.close();
     pulse_id_dataset_.close();
@@ -84,7 +84,7 @@ void SFWriter::close_file()
     file_.close();
 }
 
-void SFWriter::write(const DetectorFrame* metadata, const char* data) {
+void WriterH5Writer::write(const DetectorFrame* metadata, const char* data) {
     auto pulse_id_data = (char*)(metadata->pulse_id);
     auto frame_index_data = (char*)(metadata->frame_index);
     auto daq_rec_data = (char*)(metadata->daq_rec);
diff --git a/core-buffer/test/perf/perf_SFWriter.cpp b/core-buffer/test/perf/perf_SFWriter.cpp
index 58a9fb1..7abd6a7 100644
--- a/core-buffer/test/perf/perf_SFWriter.cpp
+++ b/core-buffer/test/perf/perf_SFWriter.cpp
@@ -5,7 +5,7 @@
 #include <RingBuffer.hpp>
 #include <thread>
 #include <chrono>
-#include "SFWriter.hpp"
+#include "WriterH5Writer.hpp"
 
 using namespace std;
 using namespace core_buffer;
@@ -33,7 +33,7 @@ int main (int argc, char *argv[])
     size_t n_modules = 32;
 
     size_t n_frames = stop_pulse_id - start_pulse_id;
-    SFWriter writer(output_file, n_frames, n_modules);
+    WriterH5Writer writer(output_file, n_frames, n_modules);
 
     // TODO: Remove stats trash.
     int i_write = 0;
diff --git a/core-buffer/test/test_SFWriter.cpp b/core-buffer/test/test_SFWriter.cpp
index ba1a72b..41b40e5 100644
--- a/core-buffer/test/test_SFWriter.cpp
+++ b/core-buffer/test/test_SFWriter.cpp
@@ -1,4 +1,4 @@
-#include "SFWriter.hpp"
+#include "WriterH5Writer.hpp"
 #include "gtest/gtest.h"
 
 using namespace core_buffer;
@@ -11,7 +11,7 @@ TEST(SFWriter, basic_interaction)
     auto data = make_unique<char[]>(n_modules*MODULE_N_BYTES);
     auto metadata = make_shared<DetectorFrame>();
 
-    SFWriter writer("ignore.h5", n_frames, n_modules);
+    WriterH5Writer writer("ignore.h5", n_frames, n_modules);
     writer.write(metadata.get(), data.get());
     writer.close_file();
 
diff --git a/sf-buffer/src/sf_stream.cpp b/sf-buffer/src/sf_stream.cpp
index ce6eeba..ddc2d0f 100644
--- a/sf-buffer/src/sf_stream.cpp
+++ b/sf-buffer/src/sf_stream.cpp
@@ -6,7 +6,7 @@
 #include <jungfrau.hpp>
 #include <thread>
 #include <chrono>
-#include "SFWriter.hpp"
+#include "WriterH5Writer.hpp"
 #include <FastQueue.hpp>
 #include <cstring>
 #include <zmq.h>