diff --git a/src/poll-group.c b/src/poll-group.c
index e3ded8d..083400a 100644
--- a/src/poll-group.c
+++ b/src/poll-group.c
@@ -61,7 +61,7 @@ HANDLE poll_group_get_afd_helper_handle(poll_group_t* poll_group) {
 poll_group_t* poll_group_acquire(port_state_t* port_state) {
   queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
   poll_group_t* poll_group =
-      !queue_empty(poll_group_queue)
+      !queue_is_empty(poll_group_queue)
           ? container_of(
                 queue_last(poll_group_queue), poll_group_t, queue_node)
           : NULL;
@@ -73,7 +73,7 @@ poll_group_t* poll_group_acquire(port_state_t* port_state) {
     return NULL;
 
   if (++poll_group->group_size == POLL_GROUP__MAX_GROUP_SIZE)
-    queue_move_first(poll_group_queue, &poll_group->queue_node);
+    queue_move_to_start(poll_group_queue, &poll_group->queue_node);
 
   return poll_group;
 }
@@ -85,7 +85,7 @@ void poll_group_release(poll_group_t* poll_group) {
   poll_group->group_size--;
   assert(poll_group->group_size < POLL_GROUP__MAX_GROUP_SIZE);
 
-  queue_move_last(poll_group_queue, &poll_group->queue_node);
+  queue_move_to_end(poll_group_queue, &poll_group->queue_node);
 
   /* Poll groups are currently only freed when the epoll port is closed. */
 }
diff --git a/src/port.c b/src/port.c
index afad1c8..6ecbb09 100644
--- a/src/port.c
+++ b/src/port.c
@@ -123,7 +123,7 @@ int port_delete(port_state_t* port_state) {
     poll_group_delete(poll_group);
   }
 
-  assert(queue_empty(&port_state->sock_update_queue));
+  assert(queue_is_empty(&port_state->sock_update_queue));
 
   DeleteCriticalSection(&port_state->lock);
 
@@ -137,7 +137,7 @@ static int port__update_events(port_state_t* port_state) {
 
   /* Walk the queue, submitting new poll requests for every socket that needs
    * it. */
-  while (!queue_empty(sock_update_queue)) {
+  while (!queue_is_empty(sock_update_queue)) {
     queue_node_t* queue_node = queue_first(sock_update_queue);
     sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
 
@@ -378,7 +378,7 @@ sock_state_t* port_find_socket(port_state_t* port_state, SOCKET socket) {
 
 void port_request_socket_update(port_state_t* port_state,
                                 sock_state_t* sock_state) {
-  if (queue_enqueued(sock_state_to_queue_node(sock_state)))
+  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
     return;
   queue_append(&port_state->sock_update_queue,
                sock_state_to_queue_node(sock_state));
@@ -387,14 +387,14 @@ void port_request_socket_update(port_state_t* port_state,
 void port_cancel_socket_update(port_state_t* port_state,
                                sock_state_t* sock_state) {
   unused_var(port_state);
-  if (!queue_enqueued(sock_state_to_queue_node(sock_state)))
+  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
     return;
   queue_remove(sock_state_to_queue_node(sock_state));
 }
 
 void port_add_deleted_socket(port_state_t* port_state,
                              sock_state_t* sock_state) {
-  if (queue_enqueued(sock_state_to_queue_node(sock_state)))
+  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
     return;
   queue_append(&port_state->sock_deleted_queue,
                sock_state_to_queue_node(sock_state));
@@ -403,7 +403,7 @@ void port_add_deleted_socket(port_state_t* port_state,
 void port_remove_deleted_socket(port_state_t* port_state,
                                 sock_state_t* sock_state) {
   unused_var(port_state);
-  if (!queue_enqueued(sock_state_to_queue_node(sock_state)))
+  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
     return;
   queue_remove(sock_state_to_queue_node(sock_state));
 }
diff --git a/src/queue.c b/src/queue.c
index 2b76e07..120f060 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -19,11 +19,11 @@ static inline void queue__detach_node(queue_node_t* node) {
 }
 
 queue_node_t* queue_first(const queue_t* queue) {
-  return !queue_empty(queue) ? queue->head.next : NULL;
+  return !queue_is_empty(queue) ? queue->head.next : NULL;
 }
 
 queue_node_t* queue_last(const queue_t* queue) {
-  return !queue_empty(queue) ? queue->head.prev : NULL;
+  return !queue_is_empty(queue) ? queue->head.prev : NULL;
 }
 
 void queue_prepend(queue_t* queue, queue_node_t* node) {
@@ -40,12 +40,12 @@ void queue_append(queue_t* queue, queue_node_t* node) {
   queue->head.prev = node;
 }
 
-void queue_move_first(queue_t* queue, queue_node_t* node) {
+void queue_move_to_start(queue_t* queue, queue_node_t* node) {
   queue__detach_node(node);
   queue_prepend(queue, node);
 }
 
-void queue_move_last(queue_t* queue, queue_node_t* node) {
+void queue_move_to_end(queue_t* queue, queue_node_t* node) {
   queue__detach_node(node);
   queue_append(queue, node);
 }
@@ -55,10 +55,10 @@ void queue_remove(queue_node_t* node) {
   queue_node_init(node);
 }
 
-bool queue_empty(const queue_t* queue) {
-  return !queue_enqueued(&queue->head);
+bool queue_is_empty(const queue_t* queue) {
+  return !queue_is_enqueued(&queue->head);
 }
 
-bool queue_enqueued(const queue_node_t* node) {
+bool queue_is_enqueued(const queue_node_t* node) {
   return node->prev != node;
 }
diff --git a/src/queue.h b/src/queue.h
index dc7aad9..f982572 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -24,11 +24,11 @@ WEPOLL_INTERNAL queue_node_t* queue_last(const queue_t* queue);
 
 WEPOLL_INTERNAL void queue_prepend(queue_t* queue, queue_node_t* node);
 WEPOLL_INTERNAL void queue_append(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_move_first(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_move_last(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_move_to_start(queue_t* queue, queue_node_t* node);
+WEPOLL_INTERNAL void queue_move_to_end(queue_t* queue, queue_node_t* node);
 WEPOLL_INTERNAL void queue_remove(queue_node_t* node);
 
-WEPOLL_INTERNAL bool queue_empty(const queue_t* queue);
-WEPOLL_INTERNAL bool queue_enqueued(const queue_node_t* node);
+WEPOLL_INTERNAL bool queue_is_empty(const queue_t* queue);
+WEPOLL_INTERNAL bool queue_is_enqueued(const queue_node_t* node);
 
 #endif /* WEPOLL_QUEUE_H_ */