diff --git a/m-dict.h b/m-dict.h
index bedbf1ee..943f01e5 100644
--- a/m-dict.h
+++ b/m-dict.h
@@ -169,7 +169,7 @@ typedef struct {
 } m_indexhash_t;
 
 // Define a basic array over such pair
-ARRAY_DEF(m_array_index, m_indexhash_t, M_POD_OPLIST)
+M_ARRAY_DEF(m_array_index, m_indexhash_t, M_POD_OPLIST)
 
 /* Performing Quadratic probing
    Replace it by '1' to perform linear probing */
@@ -1444,7 +1444,7 @@ enum m_d1ct_oa_element_e {
   M_CHECK_COMPATIBLE_OPLIST(name, 2, value_type, value_oplist)                \
                                                                               \
   /* NOTE: We don't want a real oplist for this sub type */                   \
-  ARRAY_DEF(M_F(name, _array_pair), M_F(name, _pair_ct),                      \
+  M_ARRAY_DEF(M_F(name, _array_pair), M_F(name, _pair_ct),                    \
             (INIT(M_NOTHING_DEFAULT), SET(M_MEMCPY_DEFAULT),                  \
              INIT_SET(M_MEMCPY_DEFAULT), CLEAR(M_NOTHING_DEFAULT)))           \
                                                                               \
diff --git a/m-worker.h b/m-worker.h
index 9d0a397b..18193f6c 100644
--- a/m-worker.h
+++ b/m-worker.h
@@ -142,7 +142,7 @@ typedef struct m_work3r_thread_s {
 } m_work3r_thread_ct;
 
 /* Definition of the queue that will record the work orders */
-BUFFER_DEF(m_work3r_queue, m_work3r_order_ct, 0,
+M_BUFFER_DEF(m_work3r_queue, m_work3r_order_ct, 0,
            BUFFER_QUEUE|BUFFER_UNBLOCKING_PUSH|BUFFER_BLOCKING_POP|BUFFER_THREAD_SAFE|BUFFER_DEFERRED_POP, M_WORK3R_OPLIST)
 
 /* Definition the global pool of workers */