Updated database, controllers, and tests to account for table name changes