Support spaces in names