Pluralise codelists names consistently