Use common canonical names instead of hard coded ones
Merge pull request #453 from naixx/use_canonical_names

Use canonical names