Fixup missed merge variable rename.