change some table def naming
Merge branch 'master' of https://github.com/Cherry-Pie/TableQueryBuilder