rename few callback type name