rename 'change' to 'hunk' in the appropriate places