renamed function handlers