Merge "Fix bad variable names."