Fixes to variable names