change data and SN convention to match BW

What the title says. Previous code is commented out for reference (to be removed later). Please test.