Rename callback

- Test Pull Request
Separate into service and client