Update for new Space names