Spaces in name fix