Reword and expand username specs