Fixes #5195: Escape bundle_name correctly
Merge pull request #83 from VinceMacBuche/bug_5195/escape_not_underscore

Fixes #5195: Escape bundle_name correctly