Add TODO to canonical_name