iBug (3.9): rename BSN and move code