Change variables

Change variables to allow for better understanding of what each callback does.