more consistent names
add admin interface for user