Fix from Chris for duplicate workspace names