Restore naming behaviour + set correct DIRECTORY if '--interactive'

Spaces are replaced with '_'