diff --git a/master/rtdm.c b/master/rtdm.c
index e28c26de..eac71eea 100644
--- a/master/rtdm.c
+++ b/master/rtdm.c
@@ -43,7 +43,7 @@
 /** Context structure for an open RTDM file handle.
  */
 typedef struct {
-    rtdm_user_info_t *user_info; /**< RTDM user data. */
+    rtdm_user_info_t *user_fd; /**< RTDM user data. */
     ec_ioctl_context_t ioctl_ctx; /**< Context structure. */
 } ec_rtdm_context_t;
 
@@ -143,7 +143,7 @@ int ec_rtdm_open(
     ec_rtdm_dev_t *rtdm_dev = (ec_rtdm_dev_t *) context->device->device_data;
 #endif
 
-    ctx->user_info = user_info;
+    ctx->user_fd = user_info;
     ctx->ioctl_ctx.writable = oflags & O_WRONLY || oflags & O_RDWR;
     ctx->ioctl_ctx.requested = 0;
     ctx->ioctl_ctx.process_data = NULL;
@@ -220,7 +220,7 @@ int ec_rtdm_mmap(
         container_of(ioctl_ctx, ec_rtdm_context_t, ioctl_ctx);
     int ret;
 
-    ret = rtdm_mmap_to_user(ctx->user_info,
+    ret = rtdm_mmap_to_user(ctx->user_fd,
             ioctl_ctx->process_data, ioctl_ctx->process_data_size,
             PROT_READ | PROT_WRITE,
             user_address,
diff --git a/master/rtdm_xenomai_v3.c b/master/rtdm_xenomai_v3.c
index 29db6bc9..0bc90862 100644
--- a/master/rtdm_xenomai_v3.c
+++ b/master/rtdm_xenomai_v3.c
@@ -43,7 +43,7 @@
 #define DEBUG_RTDM 0
 
 struct ec_rtdm_context {
-	struct rtdm_fd *fd;
+	struct rtdm_fd *user_fd;
 	ec_ioctl_context_t ioctl_ctx;	/**< Context structure. */
 };
 
@@ -55,7 +55,7 @@ static int ec_rtdm_open(struct rtdm_fd *fd, int oflags)
 	ec_rtdm_dev_t *rtdm_dev = dev->device_data;
 #endif
 
-	ctx->fd = fd;
+	ctx->user_fd = fd;
 
 	ctx->ioctl_ctx.writable = oflags & O_WRONLY || oflags & O_RDWR;
 	ctx->ioctl_ctx.requested = 0;