Replace " by _ when renaming to avoid Issue#2