Use model names not singularised table names pt1
Use model names not singularised table names pt2
change log entry for BC change
Merge pull request #2474 from overlookmotel/model-names-fix

User model names rather than singularized table names