cleanup commit

- try to keep the same 'keywords', like login name over username/account
name/profile name.
one more cleanup

- missed some.