Update for CIndex rename.