Correct a couple of missed variable renames