Fix space names!
