Remove Even More Aliases

As discussed before, these aliases encourage poor coding style.