revised table names to improve clarity and remove unused columns.