Second step to get rid of TVE table name, table alias and column name serialization