amending pluralisation to keep naming conventions consistent
plural amendments for directives and files to keep naming consistent