Re username versus id, I think I'd prefer just to do all those renames in one go, rather than have too much of a mix of username and id.