renamed some callback methods for better naming consistency