We still have the CamelCase problem in the model factory.

We need to fix that