Add auto-naming functionality