rename some variables
Merge branch 'master' of https://github.com/mosling/SQLReport