Just saw this:
http://blogs.intel.com/technology/2009/06/over_the last_year_or.php
So looks like intel's planning on some renames... but also Lynnfield is going to be both Core i5 and Core i7. So we'll have two sockets for Core i7 as a result (1156 & 1366) I guess; something to be wary of when choosing CPU and motherboard combinations
Centrino is being 'retired' for PC's but not wireless adapters (given that many laptops carry intel wireless I guess that means extra intel stickers on your laptop - one for the processor and one for the wireless)