Fix naming & CLI option logic

: in URL
_ in folder and file names