Correct several munged up variable names