Made more changes to variable names.