diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp
index b605a79..1862b05 100644
--- a/core-buffer/include/buffer_config.hpp
+++ b/core-buffer/include/buffer_config.hpp
@@ -63,8 +63,8 @@ namespace core_buffer {
     const int WRITER_RCVHWM = 100;
     // ZMQ threads for receiving data from sf_replay.
     const int WRITER_ZMQ_IO_THREADS = 2;
-    // Size of buffer between the receiving and writing part.
-    const int WRITER_FASTQUEUE_N_SLOTS = 5;
+    // MS to retry reading from the image assembler.
+    const size_t WRITER_IMAGE_ASSEMBLER_RETRY_MS = 5;
     // How large are metadata chunks in the HDF5.
     const size_t WRITER_METADATA_CHUNK_N_IMAGES = 100;
     // How large should the data cache be in N images.
diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp
index d5b0031..4784e71 100644
--- a/sf-writer/src/main.cpp
+++ b/sf-writer/src/main.cpp
@@ -31,7 +31,7 @@ void read_buffer(
         int slot_id;
         while((slot_id = image_assembler.get_free_slot()) == -1) {
             this_thread::sleep_for(chrono::milliseconds(
-                    RB_READ_RETRY_INTERVAL_MS));
+                    WRITER_IMAGE_ASSEMBLER_RETRY_MS));
         }
 
         auto start_time = steady_clock::now();
@@ -114,7 +114,7 @@ int main (int argc, char *argv[])
         int slot_id;
         while((slot_id = image_assembler.get_full_slot()) == -1) {
             this_thread::sleep_for(chrono::milliseconds(
-                    RB_READ_RETRY_INTERVAL_MS));
+                    WRITER_IMAGE_ASSEMBLER_RETRY_MS));
         }
 
         auto metadata = image_assembler.get_metadata_buffer(slot_id);