reverted incorrect function renaming
fixed giver not being defined for the master