XD-488 Pluralize Controllers

Jira: https://jira.springsource.org/browse/XD-488