Fixed problems with pluralised names