Changed some table names for clarity