Diageo to rework whisky, rum brands