Corrected cardinality and names