Got rid of spaces in names