Rename WrappedCallback

and other bugfixes