updating the variable names to be consistent