diff --git a/core-buffer/include/RamBuffer.hpp b/core-buffer/include/RamBuffer.hpp
index 25ad32a..7c5c55b 100644
--- a/core-buffer/include/RamBuffer.hpp
+++ b/core-buffer/include/RamBuffer.hpp
@@ -26,7 +26,7 @@ public:
               size_t meta_n_bytes,
               size_t data_n_bytes,
               int n_modules,
-              int n_slots);
+              int n_slots=buffer_config::RAM_BUFFER_N_SLOTS);
 
     ~RamBuffer();
 
@@ -38,10 +38,10 @@ public:
 
     char* get_frame_data(
             const uint64_t image_id, const uint64_t module_id) const;
-    char* get_image_data(const uint64_t image_id) const;
+    char* get_slot_data(const uint64_t image_id) const;
     char* get_frame_meta(
             const uint64_t image_id, const uint64_t module_id) const;
-    char* get_image_meta(const uint64_t image_id) const;
+    char* get_slot_meta(const uint64_t image_id) const;
 
     
 
diff --git a/core-buffer/src/RamBuffer.cpp b/core-buffer/src/RamBuffer.cpp
index 36ed54d..cf5c14e 100644
--- a/core-buffer/src/RamBuffer.cpp
+++ b/core-buffer/src/RamBuffer.cpp
@@ -18,7 +18,7 @@ RamBuffer::RamBuffer(const string& buffer_name,
                      const size_t meta_n_bytes,
                      const size_t data_n_bytes,
                      const int n_modules = 1,
-                     const int n_slots = buffer_config::RAM_BUFFER_N_SLOTS) :
+                     const int n_slots) :
         buffer_name_(buffer_name),
         n_modules_(n_modules),
         n_slots_(n_slots),
@@ -111,7 +111,7 @@ char* RamBuffer::get_frame_meta(
     return _get_meta_buffer(slot_n, module_id);
 }
 
-char* RamBuffer::get_image_meta(const uint64_t image_id) const
+char* RamBuffer::get_slot_meta(const uint64_t image_id) const
 {
     return get_frame_meta(image_id, 0);
 }
@@ -124,7 +124,7 @@ char* RamBuffer::get_frame_data(
     return _get_frame_data_buffer(slot_n, module_id);
 }
 
-char* RamBuffer::get_image_data(const uint64_t image_id) const
+char* RamBuffer::get_slot_data(const uint64_t image_id) const
 {
     return get_frame_data(image_id, 0);
 }