Modify some mappings.
More mapping changes