Renamed pluralised names to singular (where appropriate)