Fix merge error
Fix broken compatibility: in file/dir names space (' ') is replaced with
underscore ('_'). It's controlled by replace_space_with_underscore var in
the main file.