Use same singular/plural form as main name
Add links to wikipedia