Use canonical names

This is a small pull request to eliminate hardcoded typenames