Delay backannotation: fix naming probs