- Move methods to base class
- Change factory to better naming sequence

Changelog: other
MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82442
EE: true