Rename table columns
Merge branch 'hours_report' into staging