Commit #25.2

- Fix: Changed most Filenames and Class Names for the Factory and Model
Classes.