Refining language, fixing blank automatic name generation handling