diff --git a/sf-writer/include/WriterZmqReceiver.hpp b/sf-writer/include/WriterZmqReceiver.hpp
index 626ab8a..b02f9e0 100644
--- a/sf-writer/include/WriterZmqReceiver.hpp
+++ b/sf-writer/include/WriterZmqReceiver.hpp
@@ -11,7 +11,7 @@ class WriterZmqReceiver {
 
     const size_t n_modules_;
     std::vector<void*> sockets_;
-    const uint64_t end_pulse_id_;
+    const uint64_t stop_pulse_id_;
 
     ModuleFrame f_meta_;
 
diff --git a/sf-writer/src/WriterZmqReceiver.cpp b/sf-writer/src/WriterZmqReceiver.cpp
index f916d39..18d38dc 100644
--- a/sf-writer/src/WriterZmqReceiver.cpp
+++ b/sf-writer/src/WriterZmqReceiver.cpp
@@ -14,7 +14,7 @@ WriterZmqReceiver::WriterZmqReceiver(
         const uint64_t stop_pulse_id_) :
         n_modules_(n_modules),
         sockets_(n_modules),
-        end_pulse_id_(stop_pulse_id_)
+        stop_pulse_id_(stop_pulse_id_)
 {
 
     for (size_t i = 0; i < n_modules; i++) {
@@ -54,7 +54,7 @@ void WriterZmqReceiver::get_next_buffer(
         char* image_buffer)
 {
     auto n_images_in_buffer = WRITER_DATA_CACHE_N_IMAGES;
-    auto images_left = end_pulse_id_ - start_pulse_id + 1;
+    auto images_left = stop_pulse_id_ - start_pulse_id + 1;
     if (images_left < n_images_in_buffer) {
         n_images_in_buffer = images_left;
     }