Add sender hook and rename recipient's hook functions

Add sender hook and rename recipient's hook functions #1835