diff --git a/library.c b/library.c
index 6debde95..9011d746 100644
--- a/library.c
+++ b/library.c
@@ -56,7 +56,7 @@ struct openconnect_info *openconnect_vpninfo_new(char *useragent,
 	vpninfo->process_auth_form = process_auth_form;
 	vpninfo->progress = progress;
 	vpninfo->cbdata = privdata ? : vpninfo;
-	vpninfo->cancel_fd = -1;
+	vpninfo->cmd_fd = -1;
 	vpninfo->xmlpost = 1;
 	openconnect_set_reported_os(vpninfo, NULL);
 
@@ -279,7 +279,7 @@ void openconnect_set_cert_expiry_warning(struct openconnect_info *vpninfo,
 
 void openconnect_set_cancel_fd(struct openconnect_info *vpninfo, int fd)
 {
-	vpninfo->cancel_fd = fd;
+	vpninfo->cmd_fd = fd;
 }
 
 const char *openconnect_get_version(void)
diff --git a/main.c b/main.c
index 33c61116..c793aa7b 100644
--- a/main.c
+++ b/main.c
@@ -530,7 +530,7 @@ int main(int argc, char **argv)
 	vpninfo->cbdata = vpninfo;
 	vpninfo->cert_expire_warning = 60 * 86400;
 	vpninfo->vpnc_script = DEFAULT_VPNCSCRIPT;
-	vpninfo->cancel_fd = -1;
+	vpninfo->cmd_fd = -1;
 	vpninfo->xmlpost = 1;
 
 	if (!uname(&utsbuf))
diff --git a/openconnect-internal.h b/openconnect-internal.h
index 886636b4..b59638e1 100644
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -295,7 +295,7 @@ struct openconnect_info {
 	int ssl_fd;
 	int dtls_fd;
 	int new_dtls_fd;
-	int cancel_fd;
+	int cmd_fd;
 
 	struct pkt *incoming_queue;
 	struct pkt *outgoing_queue;
diff --git a/ssl.c b/ssl.c
index 5dfc6999..72c7b268 100644
--- a/ssl.c
+++ b/ssl.c
@@ -523,14 +523,14 @@ int keystore_fetch(const char *key, unsigned char **result)
 
 void cmd_fd_set(struct openconnect_info *vpninfo, fd_set *fds, int *maxfd)
 {
-	if (vpninfo->cancel_fd != -1) {
-		FD_SET(vpninfo->cancel_fd, fds);
-		if (vpninfo->cancel_fd > *maxfd)
-			*maxfd = vpninfo->cancel_fd;
+	if (vpninfo->cmd_fd != -1) {
+		FD_SET(vpninfo->cmd_fd, fds);
+		if (vpninfo->cmd_fd > *maxfd)
+			*maxfd = vpninfo->cmd_fd;
 	}
 }
 
 int is_cancel_pending(struct openconnect_info *vpninfo, fd_set *fds)
 {
-	return vpninfo->cancel_fd != -1 && FD_ISSET(vpninfo->cancel_fd, fds);
+	return vpninfo->cmd_fd != -1 && FD_ISSET(vpninfo->cmd_fd, fds);
 }