diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp
index 9fcfc9f..6f58c22 100644
--- a/core-buffer/include/buffer_config.hpp
+++ b/core-buffer/include/buffer_config.hpp
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <string>
 
-namespace core_buffer {
+namespace buffer_config {
 
     const size_t MODULE_X_SIZE = 1024;
     const size_t MODULE_Y_SIZE = 512;
diff --git a/core-buffer/include/formats.hpp b/core-buffer/include/formats.hpp
index 23526e3..a48cb8b 100644
--- a/core-buffer/include/formats.hpp
+++ b/core-buffer/include/formats.hpp
@@ -24,7 +24,7 @@ struct ModuleFrameBuffer {
 struct BufferBinaryFormat {
     const char FORMAT_MARKER = 0xBE;
     ModuleFrame metadata;
-    char data[core_buffer::MODULE_N_BYTES];
+    char data[buffer_config::MODULE_N_BYTES];
 };
 #pragma pack(pop)
 
@@ -32,7 +32,7 @@ struct BufferBinaryFormat {
 #pragma pack(1)
 struct BufferBinaryBlock
 {
-    BufferBinaryFormat frame[core_buffer::BUFFER_BLOCK_SIZE];
+    BufferBinaryFormat frame[buffer_config::BUFFER_BLOCK_SIZE];
     uint64_t start_pulse_id;
 };
 #pragma pack(pop)
diff --git a/core-buffer/src/BufferUtils.cpp b/core-buffer/src/BufferUtils.cpp
index de7ad8f..5cb6147 100644
--- a/core-buffer/src/BufferUtils.cpp
+++ b/core-buffer/src/BufferUtils.cpp
@@ -10,25 +10,25 @@ string BufferUtils::get_filename(
         std::string device_name,
         uint64_t pulse_id)
 {
-    uint64_t folder_base = pulse_id / core_buffer::FOLDER_MOD;
-    folder_base *= core_buffer::FOLDER_MOD;
+    uint64_t folder_base = pulse_id / buffer_config::FOLDER_MOD;
+    folder_base *= buffer_config::FOLDER_MOD;
 
-    uint64_t file_base = pulse_id / core_buffer::FILE_MOD;
-    file_base *= core_buffer::FILE_MOD;
+    uint64_t file_base = pulse_id / buffer_config::FILE_MOD;
+    file_base *= buffer_config::FILE_MOD;
 
     stringstream folder;
     folder << root_folder << "/";
     folder << device_name << "/";
     folder << folder_base << "/";
-    folder << file_base << core_buffer::FILE_EXTENSION;
+    folder << file_base << buffer_config::FILE_EXTENSION;
 
     return folder.str();
 }
 
 size_t BufferUtils::get_file_frame_index(uint64_t pulse_id)
 {
-    uint64_t file_base = pulse_id / core_buffer::FILE_MOD;
-    file_base *= core_buffer::FILE_MOD;
+    uint64_t file_base = pulse_id / buffer_config::FILE_MOD;
+    file_base *= buffer_config::FILE_MOD;
 
     return pulse_id - file_base;
 }
diff --git a/core-buffer/test/test_FastQueue.cpp b/core-buffer/test/test_FastQueue.cpp
index 502e705..b34fc31 100644
--- a/core-buffer/test/test_FastQueue.cpp
+++ b/core-buffer/test/test_FastQueue.cpp
@@ -2,7 +2,7 @@
 #include "formats.hpp"
 #include "gtest/gtest.h"
 
-using namespace core_buffer;
+using namespace buffer_config;
 
 TEST(FastQueue, basic_interaction)
 {
diff --git a/core-buffer/test/test_bitshuffle.cpp b/core-buffer/test/test_bitshuffle.cpp
index b8458fa..5a44de9 100644
--- a/core-buffer/test/test_bitshuffle.cpp
+++ b/core-buffer/test/test_bitshuffle.cpp
@@ -6,7 +6,7 @@ extern "C" {
 }
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 
 TEST(bitshuffle, simple_compression)
 {
diff --git a/core-buffer/test/test_buffer_utils.cpp b/core-buffer/test/test_buffer_utils.cpp
index d964816..7368e16 100644
--- a/core-buffer/test/test_buffer_utils.cpp
+++ b/core-buffer/test/test_buffer_utils.cpp
@@ -7,7 +7,7 @@ using namespace std;
 TEST(BufferUtils, get_filename)
 {
     auto expected_file = "/root/device-1/12300000/12345000" +
-            core_buffer::FILE_EXTENSION;
+                         buffer_config::FILE_EXTENSION;
 
     auto root_folder = "/root";
     auto device_name = "device-1";
diff --git a/sf-buffer/include/FrameUdpReceiver.hpp b/sf-buffer/include/FrameUdpReceiver.hpp
index 79964b0..93a2146 100644
--- a/sf-buffer/include/FrameUdpReceiver.hpp
+++ b/sf-buffer/include/FrameUdpReceiver.hpp
@@ -11,10 +11,10 @@ class FrameUdpReceiver {
 
     UdpReceiver udp_receiver_;
 
-    jungfrau_packet packet_buffer_[core_buffer::BUFFER_UDP_N_RECV_MSG];
-    iovec recv_buff_ptr_[core_buffer::BUFFER_UDP_N_RECV_MSG];
-    mmsghdr msgs_[core_buffer::BUFFER_UDP_N_RECV_MSG];
-    sockaddr_in sock_from_[core_buffer::BUFFER_UDP_N_RECV_MSG];
+    jungfrau_packet packet_buffer_[buffer_config::BUFFER_UDP_N_RECV_MSG];
+    iovec recv_buff_ptr_[buffer_config::BUFFER_UDP_N_RECV_MSG];
+    mmsghdr msgs_[buffer_config::BUFFER_UDP_N_RECV_MSG];
+    sockaddr_in sock_from_[buffer_config::BUFFER_UDP_N_RECV_MSG];
 
     bool packet_buffer_loaded_ = false;
     int packet_buffer_n_packets_ = 0;
diff --git a/sf-buffer/src/FrameUdpReceiver.cpp b/sf-buffer/src/FrameUdpReceiver.cpp
index baa82e8..a58f15d 100644
--- a/sf-buffer/src/FrameUdpReceiver.cpp
+++ b/sf-buffer/src/FrameUdpReceiver.cpp
@@ -3,7 +3,7 @@
 #include "FrameUdpReceiver.hpp"
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 
 FrameUdpReceiver::FrameUdpReceiver(
         const uint16_t port,
diff --git a/sf-buffer/src/UdpReceiver.cpp b/sf-buffer/src/UdpReceiver.cpp
index 1832674..fbe5e77 100644
--- a/sf-buffer/src/UdpReceiver.cpp
+++ b/sf-buffer/src/UdpReceiver.cpp
@@ -7,7 +7,7 @@
 #include "buffer_config.hpp"
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 
 UdpReceiver::UdpReceiver() :
     socket_fd_(-1)
diff --git a/sf-buffer/src/main.cpp b/sf-buffer/src/main.cpp
index ffbd7f4..a82ff25 100644
--- a/sf-buffer/src/main.cpp
+++ b/sf-buffer/src/main.cpp
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace chrono;
-using namespace core_buffer;
+using namespace buffer_config;
 
 void* get_live_stream_socket(const string& detector_name, const int source_id)
 {
diff --git a/sf-buffer/test/test_BufferH5Writer.cpp b/sf-buffer/test/test_BufferH5Writer.cpp
index 353562e..18d0cad 100644
--- a/sf-buffer/test/test_BufferH5Writer.cpp
+++ b/sf-buffer/test/test_BufferH5Writer.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-using namespace core_buffer;
+using namespace buffer_config;
 
 // TODO: Rewrite tests with new format.
 
diff --git a/sf-stream/src/LiveRecvModule.cpp b/sf-stream/src/LiveRecvModule.cpp
index f40a027..2dd082a 100644
--- a/sf-stream/src/LiveRecvModule.cpp
+++ b/sf-stream/src/LiveRecvModule.cpp
@@ -8,7 +8,7 @@
 
 using namespace std;
 using namespace chrono;
-using namespace core_buffer;
+using namespace buffer_config;
 using namespace stream_config;
 
 LiveRecvModule::LiveRecvModule(
diff --git a/sf-stream/src/main.cpp b/sf-stream/src/main.cpp
index cf52764..0ddbf52 100644
--- a/sf-stream/src/main.cpp
+++ b/sf-stream/src/main.cpp
@@ -17,7 +17,7 @@
 #include "stream_config.hpp"
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 using namespace stream_config;
 
 int main (int argc, char *argv[])
@@ -92,7 +92,7 @@ int main (int argc, char *argv[])
 
         if(slot_id == -1) {
             this_thread::sleep_for(chrono::milliseconds(
-                    core_buffer::RB_READ_RETRY_INTERVAL_MS));
+                    buffer_config::RB_READ_RETRY_INTERVAL_MS));
             continue;
         }
 
@@ -193,9 +193,9 @@ int main (int argc, char *argv[])
 
         if ( send_streamvis == 0 ) {
             zmq_send(socket_streamvis,
-            (char*)data,
-            core_buffer::MODULE_N_BYTES*n_modules,
-            0);
+                     (char*)data,
+                     buffer_config::MODULE_N_BYTES * n_modules,
+                     0);
         } else {
             zmq_send(socket_streamvis,
             (char*)data_empty,
@@ -233,9 +233,9 @@ int main (int argc, char *argv[])
 
         if ( send_live_analysis == 0 ) {
             zmq_send(socket_live,
-            (char*)data,
-            core_buffer::MODULE_N_BYTES*n_modules,
-            0);
+                     (char*)data,
+                     buffer_config::MODULE_N_BYTES * n_modules,
+                     0);
         } else {
             zmq_send(socket_live,
             (char*)data_empty,
diff --git a/sf-stream/test/test_LiveRecvModule.cpp b/sf-stream/test/test_LiveRecvModule.cpp
index 31c35d4..4fec472 100644
--- a/sf-stream/test/test_LiveRecvModule.cpp
+++ b/sf-stream/test/test_LiveRecvModule.cpp
@@ -5,7 +5,7 @@
 #include <future>
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 
 TEST(LiveRecvModule, transfer_test) {
     // TODO: Make this test work again.
diff --git a/sf-writer/include/ImageAssembler.hpp b/sf-writer/include/ImageAssembler.hpp
index 6c35886..3bd634a 100644
--- a/sf-writer/include/ImageAssembler.hpp
+++ b/sf-writer/include/ImageAssembler.hpp
@@ -10,10 +10,10 @@ const uint64_t IA_EMPTY_SLOT_VALUE = 0;
 
 struct ImageMetadataBlock
 {
-    uint64_t pulse_id[core_buffer::BUFFER_BLOCK_SIZE];
-    uint64_t frame_index[core_buffer::BUFFER_BLOCK_SIZE];
-    uint32_t daq_rec[core_buffer::BUFFER_BLOCK_SIZE];
-    uint8_t is_good_image[core_buffer::BUFFER_BLOCK_SIZE];
+    uint64_t pulse_id[buffer_config::BUFFER_BLOCK_SIZE];
+    uint64_t frame_index[buffer_config::BUFFER_BLOCK_SIZE];
+    uint32_t daq_rec[buffer_config::BUFFER_BLOCK_SIZE];
+    uint8_t is_good_image[buffer_config::BUFFER_BLOCK_SIZE];
     uint64_t block_start_pulse_id;
     uint64_t block_stop_pulse_id;
 };
diff --git a/sf-writer/src/BufferBinaryReader.cpp b/sf-writer/src/BufferBinaryReader.cpp
index 1db5d68..3fb979d 100644
--- a/sf-writer/src/BufferBinaryReader.cpp
+++ b/sf-writer/src/BufferBinaryReader.cpp
@@ -11,7 +11,7 @@
 
 using namespace std;
 using namespace writer_config;
-using namespace core_buffer;
+using namespace buffer_config;
 
 BufferBinaryReader::BufferBinaryReader(
         const std::string &root_folder,
diff --git a/sf-writer/src/ImageAssembler.cpp b/sf-writer/src/ImageAssembler.cpp
index 9f440c7..0d467bc 100644
--- a/sf-writer/src/ImageAssembler.cpp
+++ b/sf-writer/src/ImageAssembler.cpp
@@ -6,7 +6,7 @@
 
 using namespace std;
 using namespace writer_config;
-using namespace core_buffer;
+using namespace buffer_config;
 
 ImageAssembler::ImageAssembler(const size_t n_modules) :
     n_modules_(n_modules),
diff --git a/sf-writer/src/JFH5Writer.cpp b/sf-writer/src/JFH5Writer.cpp
index 4692cf7..ce1cfdc 100644
--- a/sf-writer/src/JFH5Writer.cpp
+++ b/sf-writer/src/JFH5Writer.cpp
@@ -15,7 +15,7 @@
 
 using namespace std;
 using namespace writer_config;
-using namespace core_buffer;
+using namespace buffer_config;
 
 JFH5Writer::JFH5Writer(const std::string& output_file,
                        const uint64_t start_pulse_id,
diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp
index 9bfae69..524c0b1 100644
--- a/sf-writer/src/main.cpp
+++ b/sf-writer/src/main.cpp
@@ -14,7 +14,7 @@
 
 using namespace std;
 using namespace writer_config;
-using namespace core_buffer;
+using namespace buffer_config;
 using namespace chrono;
 
 void read_buffer(
diff --git a/sf-writer/test/test_ImageAssembler.cpp b/sf-writer/test/test_ImageAssembler.cpp
index af8162e..1482442 100644
--- a/sf-writer/test/test_ImageAssembler.cpp
+++ b/sf-writer/test/test_ImageAssembler.cpp
@@ -4,7 +4,7 @@
 #include "gtest/gtest.h"
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 
 TEST(ImageAssembler, basic_interaction)
 {
diff --git a/sf-writer/test/test_WriterH5Writer.cpp b/sf-writer/test/test_WriterH5Writer.cpp
index c786747..cdb7142 100644
--- a/sf-writer/test/test_WriterH5Writer.cpp
+++ b/sf-writer/test/test_WriterH5Writer.cpp
@@ -5,7 +5,7 @@
 #include "bitshuffle/bitshuffle.h"
 
 using namespace std;
-using namespace core_buffer;
+using namespace buffer_config;
 
 TEST(WriterH5Writer, basic_interaction)
 {