Renamed files/objects to get rid of spaces in names that confused Xcode