Adjusts database queries to using the new table names
Merge branch 'master' of github.com:aydo/IN4325