Change name of current_handler