Changing some of the Bundle API to use a more reasonable function naming scheme