Athens said Monday it will hold talks with the Former Yugoslav Republic of Macedonia this week amid a renewed UN-backed push to solve a name row that has poisoned relations between the neighbours and sparked protests in Greece.
Athens argues that the name Macedonia suggests that Skopje has territorial claims to Greece's historic northern region of the same name.
Both countries returned to the United Nations last week hoping to reach a compromise that could end the 27-year dispute.
On Sunday, tens of thousands of Greeks protested against any deal allowing Macedonia to keep its constitutional name.
Greek Prime Minister Alexis Tsipras and his Macedonian counterpart Zoran Zaev will meet Wednesday on the sidelines of the World Economic Forum in Davos to discuss the issue.
It will be the first meeting between the two leaders, the Greek foreign ministry said.
"We expect progress towards reaching a commonly acceptable solution" at the meeting, Greek government spokesman Dimitris Tzanakopoulos told reporters on Tuesday.
"The solution must be found on the basis of a composite name, with a geographical or time-related definition, which will apply to all, making it clear that nobody has a claim on the lands or history of other peoples," he said.
Home to the port cities of Thessaloniki and Kavala, the northern Greek region of Macedonia was the centre of Alexander the Great's ancient kingdom and is a source of Greek pride.
Greece's objections to its neighbour becoming independent in 1991 as Macedonia -- the name the former Yugoslav province has used since the 1940s -- have hampered the tiny nation's bid to join the European Union and NATO.
Macedonia is currently known in the UN by the provisional name of Former Yugoslav Republic of Macedonia (FYROM), but over 100 countries have recognised it as Macedonia.
"Athens argues that the name Macedonia suggests that Skopje has territorial claims to the northern Greek region of the same name, of which Thessaloniki is the capital.
Police said more than 90,000 demonstrators had joined the protests in Thessaloniki on Sunday, organised by hardline clerics, far-right leaders and Greek diaspora groups.
Protest leaders said at least 400,000 people had turned up.
"We estimate there were at least 400,000 people. It is impressive," rally organiser Anastasios Porgialidis told AFP.
Some minor scuffles erupted between the protesters and anarchists who had organised a counter-demonstration, prompting police to intervene with tear gas.
The rally drew members of the neo-Nazi Golden Dawn party who had gathered around the statue of Alexander the Great along with local clergy.
Representatives from the main opposition party, New Democracy, were also present despite a tacit order from its liberal-minded leader Kyriakos Mitsotakis to boycott the protests.
On Sunday after the rally, however, Mitsotakis hailed the "impressive turnout that proves the particularly great sensitivity of society to the issue".
Cretans in traditional costumes who travelled from the southern island with their horses, as well as people from northern Greece wearing costumes from the Macedonian wars era a century ago, crowded at the White Tower on the Thessaloniki waterfront from early in the morning.
Police said 284 buses had transported people from around Greece to the port city.
Greece and Macedonia returned to the United Nations last week hoping to reach a compromise that could end the 27-year dispute over the former Yugoslav republic's name.
Greece's objections to the use of the name Macedonia since the Balkan country's independence in 1991 have hampered the tiny nation's bid to join the European Union and NATO.
"We want to warn our politicians not to dare to betray us. Macedonia is Greek and this is not negotiable", said protester Dimitris Triantafillidis, 50, a shop owner from the northern regional district of Pieria.
The UN negotiator Matthew Nimetz -- a 24-year veteran on the issue -- said last week that he was "very hopeful" that a solution was within reach.
Despite the nationalist fervour that is also being fed by Golden Dawn, Greeks appear to be less militant on the issue than in the past.
In 1992, more than one million people -- 10 percent of the population -- joined a rally in Thessaloniki to proclaim that "Macedonia is Greek".
According to a survey conducted for Greek radio station 24/7 by the Alco polling group, 63 percent of respondents said they thought it was in Greece's best interests to seek a mutually acceptable solution at the UN talks.
And the Greek Orthodox Church, which is traditionally opposed to the use of the term Macedonia by Skopje and led the 1992 rally, appears to have distanced itself from Sunday's events.
Its leader Archbishop Ieronymos on Thursday reportedly told Prime Minister Alexis Tsipras that "national unity is needed... (not) protests and shouts".
Tsipras, who is expected to meet with his Macedonian counterpart Zoran Zaev at the World Economic Forum in Davos, Switzerland, next week, said in an interview published Sunday: "If there is an opportunity for a solution, it would be a national stupidity not to make good use of it."
However, he told Ethnos newspaper that he could understand "the concerns and sensitivities" of the Greeks of the north.
Macedonia is known as the Former Yugoslav Republic of Macedonia (FYROM) at the United Nations, although the Security Council acknowledged this was a provisional name when it agreed to membership.
If a deal is reached at the UN talks, it will be put before Greek parliament for approval, with the government expecting the compromise name to be approved despite opposition within some parties.
According to Macedonian media, Nimetz has proposed five alternatives all containing the name.