Downstream speed is B + S; upstream speed is B - S. Boat speed in still water is the average (Down + Up)/2.
Still water boat speed is (D + U)/2; Stream speed is (D - U)/2!