Bundle names and depency fixes