Use lower-cased name of a bundle
Merge branch 'bundle_exists_fix' into master-with-fixes