added several tables and changed some table names to cleanup the naming