Changed some mappings.