Qualcomm differentiates between WCDMA (the access stratum) and UMTS (the non access stratum). Let's reflect that here. As an added bonus, we get working NAS protocol traces.
