Merge branch 'sf/chore/use-consistent-factory-file-names' into 'master'

Rename factory files to be consistently plural

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182719



Merged-by: Max Woolf <mwoolf@gitlab.com>
Approved-by: Max Woolf <mwoolf@gitlab.com>
Co-authored-by: Sam Figueroa <sfigueroa@gitlab.com>