Whatever happens, I still think it was one of the worst ideas ever to name the phone the iPhone 4S, especially considering it's not only a lot more powerful than the iPhone 4, but it's also going to have a new OS. They didn't call the new OS iOS4S, so this officially makes no sense to me.
Plus the 4S looks a lot like the 4, so people are going to mix them up and not bother buying it.