HHH-7527 Corrected bundle names and symbolic names