removed experimental stuff
Pluralize names