Improve nice names for cats and horses by including the variant/type.