The two cities have been at odds since this spring, when the Port of Oakland announced it was adding “San Francisco Bay” to the name of the airport as part of a strategy to boost passenger traffic by emphasizing the city’s geographic place in the San Francisco Bay Area.

A federal judge has ordered the Port of Oakland to stop using San Francisco Bay Oakland International Airport as its airport’s new name while a lawsuit by the city of San Francisco over copyright infringement is ongoing.

The airport’s name, San Francisco Bay Oakland International, suggested that the “lower rated airport” was associated with San Francisco, a federal judge said in a temporary order.