Fixed typo and a little rewiring of the model

Here we have a typo correction and also a little rewiring of how the model fetches the table name. The latter should mean that the model can fetch correct table names, without actively declaring them - even in scenarios where we are using custom routing. It's just a little bit faster and a little bit better. No big deal.