Improved naming of the temporary callback functions