Clarify factory file naming

The factory files are not identical to the model files. We are currently using the plural form for factories.

@ealonas