diff --git a/evennia/trunk/cmdhandler.py b/evennia/trunk/cmdhandler.py
index e947c8f4c4..5e6766536e 100755
--- a/evennia/trunk/cmdhandler.py
+++ b/evennia/trunk/cmdhandler.py
@@ -1,4 +1,4 @@
-import commands_staff
+import commands_privileged
 import commands_general
 import commands_unloggedin
 import functions_db
@@ -61,7 +61,7 @@ def handle(cdat):
             cmd = getattr(commands_general, 'cmd_%s' % (parsed_input['root_cmd'],), None )
          else:
             parsed_input['root_cmd'] = parsed_input['root_cmd'][1:]
-            cmd = getattr(commands_staff, 'cmd_%s' % (parsed_input['root_cmd'],), None )
+            cmd = getattr(commands_privileged, 'cmd_%s' % (parsed_input['root_cmd'],), None )
       else:
          cmd = getattr(commands_unloggedin, 'cmd_%s' % (parsed_input['root_cmd'],), None )
       
diff --git a/evennia/trunk/commands_staff.py b/evennia/trunk/commands_privileged.py
similarity index 99%
rename from evennia/trunk/commands_staff.py
rename to evennia/trunk/commands_privileged.py
index 2d2a60935f..27d3cd19c8 100644
--- a/evennia/trunk/commands_staff.py
+++ b/evennia/trunk/commands_privileged.py
@@ -12,8 +12,7 @@ import defines_global
 from django.contrib.auth.models import User
 from apps.objects.models import Object
 """
-Staff commands may be a bad description for this file, but it'll do for
-now. Any command here is prefixed by an '@' sign, usually denoting a 
+Any command here is prefixed by an '@' sign, usually denoting a 
 builder, staff or otherwise manipulative command that doesn't fall within 
 the scope of normal gameplay.
 """
@@ -77,7 +76,7 @@ def cmd_list(cdat):
    args = cdat['uinput']['splitted'][1:]
    argstr = ''.join(args)
    
-   msg_invalid = "Unknown option. Use one of: commands, process"
+   msg_invalid = "Unknown option. Use one of: commands, flags, process"
    
    if len(argstr) == 0:   
       session.msg(msg_invalid)
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
index c614cd659e..68de633dda 100755
Binary files a/evennia/trunk/evennia.sql and b/evennia/trunk/evennia.sql differ
diff --git a/evennia/trunk/functions_general.py b/evennia/trunk/functions_general.py
index a8bcffced3..7094b1b938 100644
--- a/evennia/trunk/functions_general.py
+++ b/evennia/trunk/functions_general.py
@@ -1,5 +1,5 @@
 import session_mgr
-import commands_staff
+import commands_privileged
 import commands_general
 import commands_unloggedin
 """
@@ -10,7 +10,7 @@ def command_list():
    Return a list of all commands.
    """
    commands = dir(commands_unloggedin) + dir(commands_general)
-   stf_commands = dir(commands_staff)
+   stf_commands = dir(commands_privileged)
    filtered = [prospect for prospect in commands if "cmd_" in prospect]
    stf_filtered = [prospect for prospect in stf_commands if "cmd_" in prospect]
    processed = []