Use canonical names

This is a small pull request to eliminate hardcoded type names. Probably, some other names should be replaced or added.