Be consistent with username label. Change User Name to Username.
Merge pull request #232 from lindegroup/username-name

Be consistent with username label. Change User Name to Username.