Fixed some table names