The dispute between Greece and the newly formed state referred to as the “Former Yugoslav Republic of Macedonia” that emerged out of the collapse of Yugoslavia in 1991 was a major source of instability in the Western Balkans for more than 25 years. It was resolved through negotiations between Athens and Skopje, mediated by the United Nations, resulting in the Prespa (or Prespes) Agreement, which was signed on June 17, 2018, and ratified by both parliaments amid controversy in their countries. The underlying issues involved deeply held and differing views relating to national identity, history, and the future of the region, which were resolved through a change in the name of the new state and various agreements as to identity issues. The author, the United Nations mediator in the dispute for 20 years and previously the United States presidential envoy with reference to the dispute, describes the basis of the dispute, the positions of the parties, and the factors that led to a successful resolution.