Continue replacing user.name instances with user.username.

Signed-off-by: Steve Finkelstein <sf@stevefink.net>