minor variable names changes