Commit #23.3

- Change: Modified Model-Factory Filenames and Class Names