Change some mappings for consistency