Properly format the spaces in names so we don't overwrite them later