Change callback names to not shadow each other.