Fixed column/table names
Merge branch 'nightly' into release