iPhone OS 4 is now iOS 4, coming June 21