New PR which adds new aliases.

Specs are now working. Sorry for previous PR.