OS 7 = OS 6.1
This will most likely roll out on the new devices whenever they come out. July-October is my guess.
QNX based Blackberries are most likely a year away. I'm guessing at that point it'll be named OS 8.x
Intersting snippet here of "refreshed" Blackberries
SaskTel (and Bell) to release "refreshed" BlackBerry Bold, Curve, Torch and Storm in Q3/Q4 | MobileSyrup.com