diff --git a/include/patty/ax25/call.h b/include/patty/ax25/call.h
index 586d25a..1358809 100644
--- a/include/patty/ax25/call.h
+++ b/include/patty/ax25/call.h
@@ -38,7 +38,7 @@ int patty_ax25_call_socket(int server,
  * bind()
  */
 typedef struct _patty_ax25_call_bind_request {
-    int socket;
+    int fd;
     patty_ax25_addr peer;
 } patty_ax25_call_bind_request;
 
@@ -48,14 +48,14 @@ typedef struct _patty_ax25_call_bind_response {
 } patty_ax25_call_bind_response;
 
 int patty_ax25_call_bind(int server,
-                         int socket,
+                         int fd,
                          patty_ax25_addr *addr);
 
 /*
  * listen()
  */
 typedef struct _patty_ax25_call_listen_request {
-    int socket;
+    int fd;
 } patty_ax25_call_listen_request;
 
 typedef struct _patty_ax25_call_listen_response {
@@ -64,13 +64,13 @@ typedef struct _patty_ax25_call_listen_response {
 } patty_ax25_call_listen_response;
 
 int patty_ax25_call_listen(int server,
-                           int socket);
+                           int fd);
 
 /*
  * accept()
  */
 typedef struct _patty_ax25_call_accept_request {
-    int socket;
+    int fd;
 } patty_ax25_call_accept_request;
 
 typedef struct _patty_ax25_call_accept_response {
@@ -81,7 +81,7 @@ typedef struct _patty_ax25_call_accept_response {
 } patty_ax25_call_accept_response;
 
 int patty_ax25_call_accept(int server,
-                           int socket,
+                           int fd,
                            patty_ax25_addr *peer,
                            char *path,
                            size_t len);
@@ -90,7 +90,7 @@ int patty_ax25_call_accept(int server,
  * connect()
  */
 typedef struct _patty_ax25_call_connect_request {
-    int socket;
+    int fd;
     patty_ax25_addr peer;
 } patty_ax25_call_connect_request;
 
@@ -100,14 +100,14 @@ typedef struct _patty_ax25_call_connect_response {
 } patty_ax25_call_connect_response;
 
 int patty_ax25_call_connect(int server,
-                            int socket,
+                            int fd,
                             patty_ax25_addr *peer);
 
 /*
  * close()
  */
 typedef struct _patty_ax25_call_close_request {
-    int socket;
+    int fd;
 } patty_ax25_call_close_request;
 
 typedef struct _patty_ax25_call_close_response {
@@ -116,13 +116,13 @@ typedef struct _patty_ax25_call_close_response {
 } patty_ax25_call_close_response;
 
 int patty_ax25_call_close(int server,
-                          int socket);
+                          int fd);
 
 /*
  * sendto()
  */
 ssize_t patty_ax25_call_sendto(int server,
-                               int socket,
+                               int fd,
                                const void *buf,
                                size_t len,
                                patty_ax25_addr *addr);
@@ -131,7 +131,7 @@ ssize_t patty_ax25_call_sendto(int server,
  * recvfrom()
  */
 int patty_ax25_call_recvfrom(int server,
-                             int socket,
+                             int fd,
                              void *buf,
                              size_t len,
                              patty_ax25_addr *addr);
diff --git a/src/call.c b/src/call.c
index a6199cf..520875f 100644
--- a/src/call.c
+++ b/src/call.c
@@ -43,12 +43,12 @@ error_io:
 }
 
 int patty_ax25_call_bind(int server,
-                         int socket,
+                         int fd,
                          patty_ax25_addr *peer) {
     enum patty_ax25_call call = PATTY_AX25_CALL_BIND;
 
     patty_ax25_call_bind_request request = {
-        socket
+        fd
     };
 
     patty_ax25_call_bind_response response;
@@ -76,11 +76,11 @@ error_io:
 }
 
 int patty_ax25_call_listen(int server,
-                           int socket) {
+                           int fd) {
     enum patty_ax25_call call = PATTY_AX25_CALL_LISTEN;
 
     patty_ax25_call_listen_request request = {
-        socket
+        fd
     };
 
     patty_ax25_call_listen_response response;
@@ -106,14 +106,14 @@ error_io:
 }
 
 int patty_ax25_call_accept(int server,
-                           int socket,
+                           int fd,
                            patty_ax25_addr *peer,
                            char *path,
                            size_t len) {
     enum patty_ax25_call call = PATTY_AX25_CALL_ACCEPT;
 
     patty_ax25_call_accept_request request = {
-        socket
+        fd
     };
 
     patty_ax25_call_accept_response response;
@@ -149,12 +149,12 @@ error_io:
 }
 
 int patty_ax25_call_connect(int server,
-                            int socket,
+                            int fd,
                             patty_ax25_addr *peer) {
     enum patty_ax25_call call = PATTY_AX25_CALL_CONNECT;
 
     patty_ax25_call_connect_request request = {
-        socket
+        fd
     };
 
     patty_ax25_call_connect_response response;
@@ -182,11 +182,11 @@ error_io:
 }
 
 int patty_ax25_call_close(int server,
-                          int socket) {
+                          int fd) {
     enum patty_ax25_call call = PATTY_AX25_CALL_CLOSE;
 
     patty_ax25_call_close_request request = {
-        socket
+        fd
     };
 
     patty_ax25_call_close_response response;
diff --git a/src/server.c b/src/server.c
index 2e3c9c3..e28bf8e 100644
--- a/src/server.c
+++ b/src/server.c
@@ -480,7 +480,7 @@ static int server_bind(patty_ax25_server *server,
         goto error_io;
     }
 
-    if ((sock = sock_by_fd(server->socks_by_fd, request.socket)) == NULL) {
+    if ((sock = sock_by_fd(server->socks_by_fd, request.fd)) == NULL) {
         response.ret = -1;
         response.eno = EBADF;
 
@@ -527,7 +527,7 @@ static int server_listen(patty_ax25_server *server,
         goto error_io;
     }
 
-    if ((sock = sock_by_fd(server->socks_by_fd, request.socket)) == NULL) {
+    if ((sock = sock_by_fd(server->socks_by_fd, request.fd)) == NULL) {
         response.ret = -1;
         response.eno = EBADF;
 
@@ -568,7 +568,7 @@ static int server_accept(patty_ax25_server *server,
         goto error_io;
     }
 
-    if ((sock = sock_by_fd(server->socks_by_fd, request.socket)) == NULL) {
+    if ((sock = sock_by_fd(server->socks_by_fd, request.fd)) == NULL) {
         response.ret = -1;
         response.eno = EBADF;
 
@@ -608,7 +608,7 @@ static int server_connect(patty_ax25_server *server,
         goto error_io;
     }
 
-    if ((sock = sock_by_fd(server->socks_by_fd, request.socket)) == NULL) {
+    if ((sock = sock_by_fd(server->socks_by_fd, request.fd)) == NULL) {
         response.ret = -1;
         response.eno = EBADF;
 
@@ -734,7 +734,7 @@ static int server_close(patty_ax25_server *server,
         goto error_io;
     }
 
-    if ((sock = sock_by_fd(server->socks_by_fd, request.socket)) == NULL) {
+    if ((sock = sock_by_fd(server->socks_by_fd, request.fd)) == NULL) {
         response.ret = -1;
         response.eno = EBADF;