normalized some table names