Added in the determination of the calling package name.