Issue #1151: Cleanup and update the default phenotype mappings
Updated mappings, a migrator will follow