Excellent question. I encountered the same issue, and I'm not sure what the solution is.

Out of curiosity, is this causing problems for people, or is it just confusing to see the device show up with the wrong type? We're encountering this as well and haven't progressed to to point of generating Profiles, so I'm wondering if this is a showstopper or just an annoyance.