diff --git a/src/port.c b/src/port.c
index 0ec36b4..18fe6a1 100644
--- a/src/port.c
+++ b/src/port.c
@@ -339,15 +339,16 @@ int ep_port_ctl(ep_port_t* port_info,
   return result;
 }
 
-int ep_port_add_socket(ep_port_t* port_info,
-                       ep_sock_t* sock_info,
-                       SOCKET socket) {
+int ep_port_register_socket_handle(ep_port_t* port_info,
+                                   ep_sock_t* sock_info,
+                                   SOCKET socket) {
   if (tree_add(&port_info->sock_tree, &sock_info->tree_node, socket) < 0)
     return_error(-1, ERROR_ALREADY_EXISTS);
   return 0;
 }
 
-int ep_port_del_socket(ep_port_t* port_info, ep_sock_t* sock_info) {
+int ep_port_unregister_socket_handle(ep_port_t* port_info,
+                                     ep_sock_t* sock_info) {
   if (tree_del(&port_info->sock_tree, &sock_info->tree_node) < 0)
     return_error(-1, ERROR_NOT_FOUND);
   return 0;
diff --git a/src/port.h b/src/port.h
index 07151e4..eefd423 100644
--- a/src/port.h
+++ b/src/port.h
@@ -48,11 +48,11 @@ WEPOLL_INTERNAL poll_group_t* ep_port_acquire_poll_group(
 WEPOLL_INTERNAL void ep_port_release_poll_group(ep_port_t* port_info,
                                                 poll_group_t* poll_group);
 
-WEPOLL_INTERNAL int ep_port_add_socket(ep_port_t* port_info,
-                                       ep_sock_t* sock_info,
-                                       SOCKET socket);
-WEPOLL_INTERNAL int ep_port_del_socket(ep_port_t* port_info,
-                                       ep_sock_t* sock_info);
+WEPOLL_INTERNAL int ep_port_register_socket_handle(ep_port_t* port_info,
+                                                   ep_sock_t* sock_info,
+                                                   SOCKET socket);
+WEPOLL_INTERNAL int ep_port_unregister_socket_handle(ep_port_t* port_info,
+                                                     ep_sock_t* sock_info);
 WEPOLL_INTERNAL ep_sock_t* ep_port_find_socket(ep_port_t* port_info,
                                                SOCKET socket);
 
diff --git a/src/sock.c b/src/sock.c
index 7733ca4..8cdfb05 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -202,7 +202,8 @@ ep_sock_t* ep_sock_new(ep_port_t* port_info, SOCKET socket) {
   tree_node_init(&sock_private->pub.tree_node);
   queue_node_init(&sock_private->pub.queue_node);
 
-  if (ep_port_add_socket(port_info, &sock_private->pub, socket) < 0)
+  if (ep_port_register_socket_handle(port_info, &sock_private->pub, socket) <
+      0)
     goto err2;
 
   return &sock_private->pub;
@@ -225,7 +226,7 @@ static void _ep_sock_delete(ep_port_t* port_info,
       _ep_sock_cancel_poll(sock_private);
 
     ep_port_cancel_socket_update(port_info, sock_info);
-    ep_port_del_socket(port_info, sock_info);
+    ep_port_unregister_socket_handle(port_info, sock_info);
 
     sock_private->delete_pending = true;
   }