Change base folder name for no space