Adapted the table names to the parser database that will come.