Clean up naming conventions by added Pluralizer