diff --git a/examples/queue.c b/examples/queue.c
index 62cd509..cfac7e8 100644
--- a/examples/queue.c
+++ b/examples/queue.c
@@ -14,8 +14,8 @@ int main(int argc, char **argv) {
         return 1;
     }
 
-    skipstone_queue_push(queue, "poop");
-    skipstone_queue_pop(queue, (void **)&message);
+    skipstone_queue_add(queue, "poop");
+    skipstone_queue_remove(queue, (void **)&message);
 
     printf("%s\n", message);
 
diff --git a/examples/queue.c-e b/examples/queue.c-e
index 62cd509..cfac7e8 100644
--- a/examples/queue.c-e
+++ b/examples/queue.c-e
@@ -14,8 +14,8 @@ int main(int argc, char **argv) {
         return 1;
     }
 
-    skipstone_queue_push(queue, "poop");
-    skipstone_queue_pop(queue, (void **)&message);
+    skipstone_queue_add(queue, "poop");
+    skipstone_queue_remove(queue, (void **)&message);
 
     printf("%s\n", message);
 
diff --git a/src/queue.c b/src/queue.c
index f0b4de6..b28e9a1 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -30,10 +30,10 @@ error_malloc_queue:
 }
 
 void skipstone_queue_destroy(skipstone_queue *queue) {
-    while (queue->last) {
-        struct entry *entry = queue->last;
+    while (queue->first) {
+        struct entry *entry = queue->first;
 
-        queue->last = entry->prev;
+        queue->first = entry->next;
 
         free(entry);
     }
diff --git a/src/queue.c-e b/src/queue.c-e
index f0b4de6..b28e9a1 100644
--- a/src/queue.c-e
+++ b/src/queue.c-e
@@ -30,10 +30,10 @@ error_malloc_queue:
 }
 
 void skipstone_queue_destroy(skipstone_queue *queue) {
-    while (queue->last) {
-        struct entry *entry = queue->last;
+    while (queue->first) {
+        struct entry *entry = queue->first;
 
-        queue->last = entry->prev;
+        queue->first = entry->next;
 
         free(entry);
     }