Rename to canonical name