moved table names to be more descriptive