TCA fixed to new table names