I use the Place Name Authority. If the PNA flags the name I want to use I reply ignore. My nonstandard name becomes an entry in the place name list. When I enter that name again my nonstandard name is one of the options I can choose from. This insures I stay consistent in both format and spelling of the name.