Fix clashing names in tf_lists