And it is after this war has ended that "Aragorn the King Elessar wedded Arwen Undomiel in the City of the Kings...and the tale of their long waiting and labours was come to fulfillment." ...
Aragorn is called Strider due to his Ranger ... At various points throughout the story, he's also called Isildur's Heir, Estel, and Elessar, as different characters know him for separate reasons ...