we can support both I suppose, but I would REALLY prefer to just support 1 name format in all the places and be done with it.