Changed name of callbacks to be more consistent.