Change some mappings