diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp
index f01e1c8..705b360 100644
--- a/core-buffer/include/buffer_config.hpp
+++ b/core-buffer/include/buffer_config.hpp
@@ -71,7 +71,7 @@ namespace core_buffer {
     const int WRITER_ZMQ_IO_THREADS = 2;
 
     // Size of buffer between the receiving and writing part.
-    const int WRITER_FASTQUEUE_SLOTS = 5;
+    const int WRITER_FASTQUEUE_N_SLOTS = 5;
 
     // Number of pulses between each statistics print out.
     const size_t STATS_MODULO = 100;
diff --git a/core-buffer/test/test_FastQueue.cpp b/core-buffer/test/test_FastQueue.cpp
index 137d571..14d360f 100644
--- a/core-buffer/test/test_FastQueue.cpp
+++ b/core-buffer/test/test_FastQueue.cpp
@@ -114,7 +114,7 @@ TEST(FaseQueue, array_parameter)
     size_t n_modules = 32;
     FastQueue<ModuleFrameBuffer> queue(
             n_modules * MODULE_N_BYTES,
-            WRITER_FASTQUEUE_SLOTS);
+            WRITER_FASTQUEUE_N_SLOTS);
 
     ModuleFrame frame;
 
diff --git a/sf-buffer/src/sf_writer.cpp b/sf-buffer/src/sf_writer.cpp
index 2df16ce..27cbc70 100644
--- a/sf-buffer/src/sf_writer.cpp
+++ b/sf-buffer/src/sf_writer.cpp
@@ -90,7 +90,7 @@ int main (int argc, char *argv[])
             MODULE_N_PIXELS, PIXEL_N_BYTES, MODULE_N_PIXELS);
 
     FastQueue<ImageMetadata> queue(
-            compress_frame_size * n_modules, WRITER_FASTQUEUE_SLOTS);
+            compress_frame_size * n_modules, WRITER_FASTQUEUE_N_SLOTS);
 
     auto ctx = zmq_ctx_new();
     zmq_ctx_set (ctx, ZMQ_IO_THREADS, WRITER_ZMQ_IO_THREADS);