Remove old aliases.
Add make mappings.