Migrate to 1.4 naming standards