Migrate to ISO 631