finish fix table names