Fixes to variable name errors

This was ran.