Changed variable names so they actually make sense (followed Tony's
suggestion).