diff --git a/m-list.h b/m-list.h
index e8127ef3..860b8fd2 100644
--- a/m-list.h
+++ b/m-list.h
@@ -102,13 +102,13 @@
   /* Define alloc functions. If MEMPOOL, we need to define it */	\
   M_IF_METHOD(MEMPOOL, oplist)(                                         \
 			       						\
-    MEMPOOL_DEF(M_C(name, mempool_list), struct M_C(name, _s))          \
-    M_GET_MEMPOOL_LINKAGE oplist M_C(name, mempool_list_t) M_GET_MEMPOOL oplist; \
+    MEMPOOL_DEF(M_C(name, _mempool), struct M_C(name, _s))              \
+    M_GET_MEMPOOL_LINKAGE oplist M_C(name, _mempool_t) M_GET_MEMPOOL oplist; \
     static inline struct M_C(name, _s) *M_C(name, _int_new)(void) {	\
-      return M_C(name, mempool_list_alloc)(M_GET_MEMPOOL oplist);	\
+      return M_C(name, _mempool_alloc)(M_GET_MEMPOOL oplist);		\
     }                                                                   \
     static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) {	\
-      M_C(name, mempool_list_free)(M_GET_MEMPOOL oplist, ptr);		\
+      M_C(name, _mempool_free)(M_GET_MEMPOOL oplist, ptr);		\
     }                                                                   \
 									\
     , /* No mempool allocation */                                       \
@@ -116,7 +116,7 @@
     static inline struct M_C(name, _s) *M_C(name, _int_new)(void) {	\
       return M_GET_NEW oplist (struct M_C(name, _s));			\
     }                                                                   \
-    static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) { \
+    static inline void M_C(name,_int_del)(struct M_C(name, _s) *ptr) {	\
       M_GET_DEL oplist (ptr);                                           \
     }                                                                   \
 									) \
diff --git a/m-rbtree.h b/m-rbtree.h
index c4330992..f67dcc11 100644
--- a/m-rbtree.h
+++ b/m-rbtree.h
@@ -144,15 +144,14 @@ typedef enum {
   typedef type M_C(name, _type_t);					\
                                                                         \
   M_IF_METHOD(MEMPOOL, oplist)(                                         \
-    MEMPOOL_DEF(M_C(name, _mempool_rbtree), node_t)                     \
-    M_GET_MEMPOOL_LINKAGE oplist M_C(name, mempool_rbtree_t) M_GET_MEMPOOL oplist; \
+    MEMPOOL_DEF(M_C(name, _mempool), node_t)                            \
+    M_GET_MEMPOOL_LINKAGE oplist M_C(name, _mempool_t) M_GET_MEMPOOL oplist; \
     static inline node_t *M_C(name,_int_new)(void) {			\
-      return M_C(name, _mempool_rbtree_alloc)(M_GET_MEMPOOL oplist);	\
+      return M_C(name, _mempool_alloc)(M_GET_MEMPOOL oplist);		\
     }                                                                   \
     static inline void M_C(name,_int_del)(node_t *ptr) {		\
-      M_C(name, mempool_rbtree_free)(M_GET_MEMPOOL oplist, ptr);	\
+      M_C(name, _mempool_free)(M_GET_MEMPOOL oplist, ptr);		\
     }                                                                   \
-    RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t)         \
 									\
     , /* No mempool allocation */                                       \
 									\
@@ -161,8 +160,9 @@ typedef enum {
     }                                                                   \
     static inline void M_C(name,_int_del)(node_t *ptr) {		\
       M_GET_DEL oplist (ptr);                                           \
-    }                                                                   \
-    RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t) )
+    }                                                                 ) \
+									\
+    RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t)
 
 #define RBTREEI_DEF3(name, type, oplist, tree_t, node_t, tree_it_t)     \
   									\