Minor variable name fixes.