Move references to name out of bundle.py