Updated space names