Fix issue with overzealous rename of a variable