Change extended mappings to "relevant" mappings

See commit messages for summaries