Updating listener callbacks names