@magicalclick: Win7 and WP7 are going to keep their current feature set and branding.  They just won't get all of the added features.  They will have access to the same music library though so technically Win7 and WP7 are getting that as an upgrade.