Variable name fixup.