Fixup some variable names.