improved auto-naming