Same naming convention.

As indicated by the team, the final convention was to capture collection-type (?) classes with name in plural. With that in mind, I (Razvan) will re-look through the model for consistency with this convention.