diff --git a/core/net/neighbor-attr.c b/core/net/neighbor-attr.c
index fa16cd1ff..38b42839a 100644
--- a/core/net/neighbor-attr.c
+++ b/core/net/neighbor-attr.c
@@ -50,7 +50,7 @@
 
 static uint16_t timeout = 0;
 
-MEMB(neighbor_addr_mem, struct neighbor_addr, MAX_NEIGHBORS);
+MEMB(neighbor_addr_mem, struct neighbor_addr, NEIGHBOR_ATTR_MAX_NEIGHBORS);
 
 LIST(neighbor_addrs);
 LIST(neighbor_attrs);
diff --git a/core/net/neighbor-attr.h b/core/net/neighbor-attr.h
index bfde86260..885b92cf4 100644
--- a/core/net/neighbor-attr.h
+++ b/core/net/neighbor-attr.h
@@ -39,9 +39,9 @@
  * define how many neighbors you can store
  */
 #ifdef NEIGHBOR_CONF_MAX_NEIGHBORS
-#define MAX_NEIGHBORS NEIGHBOR_CONF_MAX_NEIGHBORS
+#define NEIGHBOR_ATTR_MAX_NEIGHBORS NEIGHBOR_CONF_MAX_NEIGHBORS
 #else                           /* NEIGHBOR_CONF_MAX_NEIGHBORS */
-#define MAX_NEIGHBORS 12
+#define NEIGHBOR_ATTR_MAX_NEIGHBORS 12
 #endif                          /* NEIGHBOR_CONF_MAX_NEIGHBORS */
 
 /**
@@ -75,7 +75,7 @@ struct neighbor_attr {
  *             during initialization.
  */
 #define NEIGHBOR_ATTRIBUTE(type, name, default_value_ptr) \
-  static type _##name##_mem[MAX_NEIGHBORS]; \
+  static type _##name##_mem[NEIGHBOR_ATTR_MAX_NEIGHBORS]; \
   static struct neighbor_attr name = \
     {NULL, sizeof(type), default_value_ptr, (void*)_##name##_mem} ; \