#1: Renamed some tables, renamed some columns, so that they comply to the team naming conventions