Refactoring callback names.