Minor changes to variable names to conform with notation