Restoring clue constraint rename behavior