Fix user names