A long-running dispute over the name of Oakland’s airport has been resolved, officials announced.

The airport officially will be called “Oakland San Francisco Bay Airport.”

The agreement settles a trademark lawsuit between the city and county of San Francisco and the Port of Oakland over the airport’s branding.

The dispute began in 2024 when the East Bay airport changed its name to “San Francisco-Oakland Bay Airport,” prompting objections from San Francisco officials.

The new name is part of a resolution between the two sides, bringing an end to the yearlong legal battle.