Made short names correctly incorporate states