Avoid using aliases
Merge pull request #50 from wmde/aliases

Avoid using aliases