Rename table columns to work with DBAModel::GetCountSQL()
Merge remote-tracking branch 'origin/master'