Use full class names instead of aliases

This is the simple, easy to merge stuff split from #218.