Change to variable names to meet naming standards