Swapping aliases to favor shorter form.

Also adds missing alias for site tags.