Rename usernames titles, and ensure they are unique
Remove unused type