Actually, it could be a benefit to keep the class B! But if you want it changed just go to your local DMV and request a change. Note, you might consider setting an appointment to not having to wait.
I don't know but usually they ask what type license you're applying for and if not too, they probably go with what you had.
Thanks! Your answer is awaiting moderation.