The Port of Oakland and the City and County of San Francisco have reached a settlement, allowing Oakland International Airport to include "San Francisco" in its name. The agreement resolves a trademark lawsuit over the proposed renaming.