diff --git a/nova/context.py b/nova/context.py
index 7ea29f3c5697..64d5807f6536 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -101,9 +101,9 @@ class RequestContext(context.RequestContext):
                 authentication data.
         """
         if user_id:
-            kwargs['user'] = user_id
+            kwargs['user_id'] = user_id
         if project_id:
-            kwargs['tenant'] = project_id
+            kwargs['project_id'] = project_id
 
         super(RequestContext, self).__init__(is_admin=is_admin, **kwargs)