In a move that definitely makes sense, given the number of products that aren’t phones running iPhone OS, Apple has renamed iPhone OS to, simply, iOS. The next iteration of iOS will be iOS4.
Don’t let this confuse you, iPhone OS4 = iOS4. It is simply a name change. The features announced for iPhone OS4 will be the same as the features included in iOS4.