Changing aliases to be semantic