Factory naming consistency

- Renamed factory classes to shorter and more readable ones.