Fixed table name substitution when the column name contains the table name