Use full words in names
Fix wrong pluralisation of 'vCard'