When I watched that "greatest hits" montage, I remember thinking, "So basically they threw in a fan-made ship video to end the series."

Her name was probably changed to Margot in reference to La Reine Margot, the historical novel by Alexandre Dumas and 1994 French film.