diff --git a/core-buffer/include/jungfrau.hpp b/core-buffer/include/jungfrau.hpp
index 4fb0bf2..1f3a27d 100644
--- a/core-buffer/include/jungfrau.hpp
+++ b/core-buffer/include/jungfrau.hpp
@@ -7,7 +7,7 @@
 #define JUNGFRAU_N_MODULES 32
 #define JUNGFRAU_BYTES_PER_PACKET 8246
 #define JUNGFRAU_DATA_BYTES_PER_PACKET 8192
-#define JUNGFRAU_N_PACKETS_PER_FRAME 128
+#define JF_N_PACKETS_PER_FRAME 128
 #define JUNGFRAU_DATA_BYTES_PER_FRAME 1048576
 #define JF_BYTES_PER_FRAME (8246 * 128)
 
diff --git a/sf-buffer/src/BufferUdpReceiver.cpp b/sf-buffer/src/BufferUdpReceiver.cpp
index 68b51dc..ddab5c2 100644
--- a/sf-buffer/src/BufferUdpReceiver.cpp
+++ b/sf-buffer/src/BufferUdpReceiver.cpp
@@ -76,7 +76,7 @@ inline uint64_t BufferUdpReceiver::process_packets(
 
         // Last frame packet received. Frame finished.
         if (packet_buffer_[i_packet].packetnum ==
-            JUNGFRAU_N_PACKETS_PER_FRAME-1)
+            JF_N_PACKETS_PER_FRAME - 1)
         {
             // Buffer is loaded only if this is not the last message.
             if (i_packet+1 != packet_buffer_n_packets_) {
diff --git a/sf-buffer/src/main.cpp b/sf-buffer/src/main.cpp
index 248e32a..22965ed 100644
--- a/sf-buffer/src/main.cpp
+++ b/sf-buffer/src/main.cpp
@@ -110,9 +110,9 @@ int main (int argc, char *argv[]) {
             send_max_us = send_us_duration;
         }
 
-        if (metadata.n_received_packets < JUNGFRAU_N_PACKETS_PER_FRAME) {
+        if (metadata.n_received_packets < JF_N_PACKETS_PER_FRAME) {
             n_missed_packets +=
-                    JUNGFRAU_N_PACKETS_PER_FRAME - metadata.n_received_packets;
+                    JF_N_PACKETS_PER_FRAME - metadata.n_received_packets;
             n_corrupted_frames++;
         }
 
diff --git a/sf-buffer/test/test_BufferUdpReceiver.cpp b/sf-buffer/test/test_BufferUdpReceiver.cpp
index 141607c..352eaa3 100644
--- a/sf-buffer/test/test_BufferUdpReceiver.cpp
+++ b/sf-buffer/test/test_BufferUdpReceiver.cpp
@@ -12,7 +12,7 @@ using namespace std;
 
 TEST(BufferUdpReceiver, simple_recv)
 {
-    auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
+    auto n_packets = JF_N_PACKETS_PER_FRAME;
     int source_id = 1234;
     int n_frames = 5;
 
@@ -65,7 +65,7 @@ TEST(BufferUdpReceiver, simple_recv)
 
 TEST(BufferUdpReceiver, missing_middle_packet)
 {
-    auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
+    auto n_packets = JF_N_PACKETS_PER_FRAME;
     int source_id = 1234;
     int n_frames = 3;
 
@@ -123,7 +123,7 @@ TEST(BufferUdpReceiver, missing_middle_packet)
 
 TEST(BufferUdpReceiver, missing_first_packet)
 {
-    auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
+    auto n_packets = JF_N_PACKETS_PER_FRAME;
     int source_id = 1234;
     int n_frames = 3;
 
@@ -181,7 +181,7 @@ TEST(BufferUdpReceiver, missing_first_packet)
 
 TEST(BufferUdpReceiver, missing_last_packet)
 {
-    auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
+    auto n_packets = JF_N_PACKETS_PER_FRAME;
     int source_id = 1234;
     int n_frames = 3;
 
diff --git a/sf-buffer/test/test_UdpReceiver.cpp b/sf-buffer/test/test_UdpReceiver.cpp
index fd3a527..a7a6af0 100644
--- a/sf-buffer/test/test_UdpReceiver.cpp
+++ b/sf-buffer/test/test_UdpReceiver.cpp
@@ -106,7 +106,7 @@ TEST(UdpReceiver, false_recv)
 
 TEST(UdpReceiver, receive_many)
 {
-    auto n_msg_buffer = JUNGFRAU_N_PACKETS_PER_FRAME;
+    auto n_msg_buffer = JF_N_PACKETS_PER_FRAME;
     jungfrau_packet recv_buffer[n_msg_buffer];
     iovec recv_buff_ptr[n_msg_buffer];
     struct mmsghdr msgs[n_msg_buffer];
@@ -154,7 +154,7 @@ TEST(UdpReceiver, receive_many)
 
     this_thread::sleep_for(chrono::milliseconds(10));
 
-    auto n_msgs = udp_receiver.receive_many(msgs, JUNGFRAU_N_PACKETS_PER_FRAME);
+    auto n_msgs = udp_receiver.receive_many(msgs, JF_N_PACKETS_PER_FRAME);
     ASSERT_EQ(n_msgs, 2);
 
     for (size_t i=0;i<n_msgs;i++) {
@@ -162,7 +162,7 @@ TEST(UdpReceiver, receive_many)
         ASSERT_EQ(recv_buffer[i].bunchid, i);
     }
 
-    n_msgs = udp_receiver.receive_many(msgs, JUNGFRAU_N_PACKETS_PER_FRAME);
+    n_msgs = udp_receiver.receive_many(msgs, JF_N_PACKETS_PER_FRAME);
     ASSERT_EQ(n_msgs, -1);
 
     udp_receiver.disconnect();