Fix nicknames