Add a few aliases. Correct others.