diff --git a/source/include/context.h b/source/include/context.h
index 68ae3ffc88a..50702284405 100644
--- a/source/include/context.h
+++ b/source/include/context.h
@@ -29,7 +29,7 @@
 */
 
 /* the current user context for a request */
-struct user_context {
+struct smbsrv_user {
 	/* the vuid is used to specify the security context for this
 	   request. Note that this may not be the same vuid as we
 	   received on the wire (for example, for share mode or guest
@@ -87,7 +87,7 @@ struct request_context {
 	struct tcon_context *conn;
 
 	/* the user context is derived from the vuid plus smb.conf options */
-	struct user_context *user_ctx;
+	struct smbsrv_user *user_ctx;
 
 	/* a talloc context for the lifetime of this request */
 	TALLOC_CTX *mem_ctx;
diff --git a/source/smb_server/smb_server.c b/source/smb_server/smb_server.c
index a89007d68d7..823757ff3bf 100644
--- a/source/smb_server/smb_server.c
+++ b/source/smb_server/smb_server.c
@@ -118,13 +118,13 @@ static struct request_context *receive_smb_request(struct smbsrv_context *smb_ct
 */
 static void setup_user_context(struct request_context *req)
 {
-	struct user_context *ctx;
+	struct smbsrv_user *user_ctx;
 
-	ctx = talloc(req->mem_ctx, sizeof(*ctx));
-	ctx->vuid = SVAL(req->in.hdr, HDR_UID);
-	ctx->vuser = get_valid_user_struct(req->smb_ctx, ctx->vuid);
+	user_ctx = talloc(req->mem_ctx, sizeof(*user_ctx));
+	user_ctx->vuid = SVAL(req->in.hdr, HDR_UID);
+	user_ctx->vuser = get_valid_user_struct(req->smb_ctx, user_ctx->vuid);
 
-	req->user_ctx = ctx;
+	req->user_ctx = user_ctx;
 }