Rename circle to sphere, etc.
xCode mods