Final changes for rename to name instead of username.