Fixing bundle names