Refactoring naming to make clearer distinction between upcalls and
callbacks