renamed tables to follow naming convention