diff --git a/core-buffer/include/BufferH5Writer.hpp b/core-buffer/include/BufferH5Writer.hpp
index a90a522..a4f61b2 100644
--- a/core-buffer/include/BufferH5Writer.hpp
+++ b/core-buffer/include/BufferH5Writer.hpp
@@ -23,8 +23,8 @@ class BufferH5Writer {
             core_buffer::MODULE_X_SIZE
     };
 
-    const std::string device_name_;
     const std::string root_folder_;
+    const std::string device_name_;
     const std::string LATEST_filename_;
     const std::string CURRENT_filename_;
 
@@ -42,8 +42,8 @@ class BufferH5Writer {
 
 public:
     BufferH5Writer(
-            const std::string& device_name,
-            const std::string& root_folder);
+            const std::string& root_folder,
+            const std::string& device_name);
 
     virtual ~BufferH5Writer();
 
diff --git a/core-buffer/src/BufferH5Writer.cpp b/core-buffer/src/BufferH5Writer.cpp
index 1f3d021..ed7ce39 100644
--- a/core-buffer/src/BufferH5Writer.cpp
+++ b/core-buffer/src/BufferH5Writer.cpp
@@ -13,10 +13,10 @@ using namespace std;
 using namespace core_buffer;
 
 BufferH5Writer::BufferH5Writer(
-        const string& device_name,
-        const string& root_folder) :
-            device_name_(device_name),
+        const string& root_folder,
+        const string& device_name) :
             root_folder_(root_folder),
+            device_name_(device_name),
             LATEST_filename_(root_folder + "/" + device_name + "/LATEST"),
             CURRENT_filename_(root_folder + "/" + device_name + "/CURRENT"),
             output_filename_(""),
diff --git a/core-buffer/test/test_BufferH5Writer.cpp b/core-buffer/test/test_BufferH5Writer.cpp
index dec6a8e..816b41c 100644
--- a/core-buffer/test/test_BufferH5Writer.cpp
+++ b/core-buffer/test/test_BufferH5Writer.cpp
@@ -17,7 +17,7 @@ TEST(BufferH5Writer, basic_interaction)
     metadata.daq_rec = 3;
     metadata.n_received_packets = 128;
 
-    BufferH5Writer writer(device_name, root_folder);
+    BufferH5Writer writer(root_folder, device_name);
     writer.set_pulse_id(pulse_id);
     writer.write(&metadata, buffer.get());
     writer.close_file();
diff --git a/sf-buffer/src/sf_buffer.cpp b/sf-buffer/src/sf_buffer.cpp
index 001975d..3d804d0 100644
--- a/sf-buffer/src/sf_buffer.cpp
+++ b/sf-buffer/src/sf_buffer.cpp
@@ -59,7 +59,7 @@ int main (int argc, char *argv[]) {
     uint64_t n_corrupted_frames = 0;
     uint64_t last_pulse_id = 0;
 
-    BufferH5Writer writer(device_name, root_folder);
+    BufferH5Writer writer(root_folder, device_name);
     BufferUdpReceiver receiver(udp_port, source_id);
 
     pid_t tid;