Change mappings to better accomodate ruby refactoring mappings.