Right except iMac.... it'll go to Merom which is a drop-in replacement for Yonah (Core Duo)
Although I agree that eventually Mac mini and MacBook will be Merom, I think it may be many months later..... I think the mini with the Core Solo might get upgraded to Core Duo tho' ... so that Apple can boast to be the _only_ major manufacturer to use dual-core across the whole product range!
Note that if I'm right (trust me!), then there's a gap.... no Apple box with a Conroe? I don't think so.... Apple will introduce a new system with support for a single Conroe. Hopefully it won't be the MacPro with a different mobo, but a completely new box (fingers crossed).
Oh.... the recently released educational iMac won't get Merom at first either... it'll get left behind so as to make the proper iMacs better value and worth splashing out for!