Use full class names instead of aliases
Merge pull request #223 from wmde/simplealiases

Use full class names instead of aliases