Reintegrating code after bundle name change - this seemed to reset everything