diff --git a/core-buffer/include/formats.hpp b/core-buffer/include/formats.hpp
index ef3a9fb..80bea40 100644
--- a/core-buffer/include/formats.hpp
+++ b/core-buffer/include/formats.hpp
@@ -4,7 +4,7 @@
 #include "buffer_config.hpp"
 #include "jungfrau.hpp"
 
-struct ImageMetadataBuffer
+struct ImageMetadataBlock
 {
     uint64_t pulse_id[core_buffer::BUFFER_BLOCK_SIZE];
     uint64_t frame_index[core_buffer::BUFFER_BLOCK_SIZE];
@@ -29,7 +29,7 @@ struct BufferBinaryFormat {
 
 #pragma pack(push)
 #pragma pack(1)
-struct BufferBlock
+struct BufferBinaryBlock
 {
     BufferBinaryFormat frame[core_buffer::BUFFER_BLOCK_SIZE];
     uint64_t start_pulse_id;
diff --git a/core-buffer/src/FastQueue.cpp b/core-buffer/src/FastQueue.cpp
index 1595278..c3f9daf 100644
--- a/core-buffer/src/FastQueue.cpp
+++ b/core-buffer/src/FastQueue.cpp
@@ -103,7 +103,7 @@ void FastQueue<T>::release()
     read_slot_id_ %= n_slots_;
 }
 
-template class FastQueue<ImageMetadataBuffer>;
+template class FastQueue<ImageMetadataBlock>;
 template class FastQueue<ReplayBuffer>;
 template class FastQueue<ModuleFrame>;
 template class FastQueue<ModuleFrameBuffer>;
diff --git a/sf-writer/include/JFH5Writer.hpp b/sf-writer/include/JFH5Writer.hpp
index 2724f3d..4e96e9a 100644
--- a/sf-writer/include/JFH5Writer.hpp
+++ b/sf-writer/include/JFH5Writer.hpp
@@ -27,7 +27,7 @@ public:
                const size_t n_images,
                const size_t n_modules);
     ~JFH5Writer();
-    void write(const ImageMetadataBuffer* metadata, const char* data);
+    void write(const ImageMetadataBlock* metadata, const char* data);
     void close_file();
 
     uint64_t* b_pulse_id_;
diff --git a/sf-writer/include/WriterZmqReceiver.hpp b/sf-writer/include/WriterZmqReceiver.hpp
index c66ba91..96bc16c 100644
--- a/sf-writer/include/WriterZmqReceiver.hpp
+++ b/sf-writer/include/WriterZmqReceiver.hpp
@@ -26,7 +26,7 @@ public:
 
     void get_next_buffer(
             const uint64_t start_pulse_id,
-            ImageMetadataBuffer* i_meta,
+            ImageMetadataBlock* i_meta,
             char* image_buffer);
 };
 
diff --git a/sf-writer/src/JFH5Writer.cpp b/sf-writer/src/JFH5Writer.cpp
index affd557..1abd2fb 100644
--- a/sf-writer/src/JFH5Writer.cpp
+++ b/sf-writer/src/JFH5Writer.cpp
@@ -114,7 +114,7 @@ void JFH5Writer::close_file()
 }
 
 void JFH5Writer::write(
-        const ImageMetadataBuffer* metadata, const char* data)
+        const ImageMetadataBlock* metadata, const char* data)
 {
     size_t n_images_to_copy = min(n_images_ - current_write_index_,
                                   BUFFER_BLOCK_SIZE);
diff --git a/sf-writer/src/WriterZmqReceiver.cpp b/sf-writer/src/WriterZmqReceiver.cpp
index 18d38dc..b01b6f5 100644
--- a/sf-writer/src/WriterZmqReceiver.cpp
+++ b/sf-writer/src/WriterZmqReceiver.cpp
@@ -50,7 +50,7 @@ WriterZmqReceiver::~WriterZmqReceiver()
 
 void WriterZmqReceiver::get_next_buffer(
         const uint64_t start_pulse_id,
-        ImageMetadataBuffer* i_meta,
+        ImageMetadataBlock* i_meta,
         char* image_buffer)
 {
     auto n_images_in_buffer = WRITER_DATA_CACHE_N_IMAGES;
diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp
index fda91ff..d4da930 100644
--- a/sf-writer/src/main.cpp
+++ b/sf-writer/src/main.cpp
@@ -20,7 +20,7 @@ void receive_replay(
         void* ctx,
         const string ipc_prefix,
         const size_t n_modules,
-        FastQueue<ImageMetadataBuffer>& queue,
+        FastQueue<ImageMetadataBlock>& queue,
         const uint64_t start_pulse_id,
         const uint64_t stop_pulse_id)
 {
@@ -84,7 +84,7 @@ int main (int argc, char *argv[])
 
     size_t n_modules = 32;
 
-    FastQueue<ImageMetadataBuffer> queue(
+    FastQueue<ImageMetadataBlock> queue(
             MODULE_N_BYTES * n_modules * WRITER_DATA_CACHE_N_IMAGES,
             WRITER_FASTQUEUE_N_SLOTS);
 
diff --git a/sf-writer/test/manual/test_sf_writer_recv.cpp b/sf-writer/test/manual/test_sf_writer_recv.cpp
index 9a505d8..b78c48f 100644
--- a/sf-writer/test/manual/test_sf_writer_recv.cpp
+++ b/sf-writer/test/manual/test_sf_writer_recv.cpp
@@ -18,7 +18,7 @@ void receive_replay(
         void* ctx,
         const string ipc_prefix,
         const size_t n_modules,
-        FastQueue<ImageMetadataBuffer>& queue,
+        FastQueue<ImageMetadataBlock>& queue,
         const uint64_t start_pulse_id,
         const uint64_t stop_pulse_id)
 {
@@ -89,7 +89,7 @@ int main (int argc, char *argv[])
 
     size_t n_modules = 32;
 
-    FastQueue<ImageMetadataBuffer> queue(
+    FastQueue<ImageMetadataBlock> queue(
             MODULE_N_BYTES * n_modules * WRITER_DATA_CACHE_N_IMAGES,
             WRITER_FASTQUEUE_N_SLOTS);
 
diff --git a/sf-writer/test/test_WriterH5Writer.cpp b/sf-writer/test/test_WriterH5Writer.cpp
index e5236f9..abcc4be 100644
--- a/sf-writer/test/test_WriterH5Writer.cpp
+++ b/sf-writer/test/test_WriterH5Writer.cpp
@@ -12,7 +12,7 @@ TEST(WriterH5Writer, basic_interaction)
     size_t n_frames = 5;
 
     auto data = make_unique<char[]>(n_modules*MODULE_N_BYTES);
-    auto metadata = make_shared<ImageMetadataBuffer>();
+    auto metadata = make_shared<ImageMetadataBlock>();
 
     // Needed by writer.
     metadata->data_n_bytes[0] = 500;