Fixed names for user