Fixup some variable names