Rename callback scheme as it is confusing