Minor tweaks of space names.