Generize "rename capture" for reuse
Try using generized "rename capture" for clue constraint renaming