Finding a more elegant solution for the scratch - space issue

[marc-portier]

We now just replace all space with _ (underscore)
Can't really see how else we could do it with the current way of working of the scratch internals, but still.