Had to modify names of bundles to prevent warnings; probably won't push
this.