Updated database table and column names