We should rename username first.

Rename the username in datastore before we update the datastore.

Change-Id: I383bd19e185e98ac17f43d59907215133b2575e9