Saving before switching over to canonical name.
Using canonical names now.