Update diff mapping, more consistent naming, swap indent mappings.