Fixes #5245: Simpler regexp to parse bundle name