FORGE-1511 - Pluralize
Update to be in the JPA category and follow proper naming