Calling a state by the same name as one of its cities is hopelessly confusing. You can avoid it.
Hampshire is a county in England. New Hampshire is a state in New England. York is a city in the region of Yorkshire, England. Likewise, the state that contains the city of New York can only be New Yorkshire.