var and function name changes
Merge pull request #407 from NICTA/tableCleanup

var and function name changes