Rename of callback types.
Updated docs