The UK arm of Smirnoff producer Diageo today said it had settled a two-year dispute with a rival firm over the name of a "confusing" vodka-based drink.