Use correct type names (cardinals, etc)