Naming utils (now tested)