Rename currency id after adjusting for inconsistentcy