diff --git a/m-bptree.h b/m-bptree.h
index cac7b661..76f9249a 100644
--- a/m-bptree.h
+++ b/m-bptree.h
@@ -700,7 +700,7 @@
     }                                                                   \
   }                                                                     \
                                                                         \
-  static inline bool M_C(name, _pop)(value_t *ptr, tree_t b, key_t const key) \
+  static inline bool M_C(name, _pop_at)(value_t *ptr, tree_t b, key_t const key) \
   {                                                                     \
     if (ptr != NULL) {                                                  \
       value_t *ref = M_C(name, _get)(b, key);                           \
diff --git a/tests/test-mbptree.c b/tests/test-mbptree.c
index cc48426c..3da263fd 100644
--- a/tests/test-mbptree.c
+++ b/tests/test-mbptree.c
@@ -151,18 +151,18 @@ static void test2(void)
     assert (*btree_cget(b, i) == 100*i);
   assert (btree_size(b) == 100);
   int k;
-  bool r = btree_pop(NULL, b, 0);
+  bool r = btree_pop_at(NULL, b, 0);
   assert (r == true);
   assert (btree_size(b) == 99);
-  r = btree_pop(&k, b, 1);
+  r = btree_pop_at(&k, b, 1);
   assert (r == true);
   assert (btree_size(b) == 98);
   assert (k == 100);
   k = -2;
-  r = btree_pop(&k, b, 1);
+  r = btree_pop_at(&k, b, 1);
   assert (r == false);
   assert (k == -2);
-  r = btree_pop(NULL, b, 0);
+  r = btree_pop_at(NULL, b, 0);
   assert (r == false);
   btree_clean(b);
   assert (btree_size(b) == 0);