Widgets (3.8): rename BSN and move code