The change was made during the 5.x code upgrade. If you upgrade from 3.x > 5,x, the licenses will be converted for you.
Basically, they consolidated all licenses into 3 (there are a couple more now, but they are specific to service providers and content security).
The AP licenses stay as AP licenses.
The RAP licenses get converted to AP licenses (a RAP now consumes an AP licenses).
The PEF license is now called PEF-NG and is based on the number of APs you have, not users.
The WIP license is now called RFP (rf protect) and is based on the number of APs.
The following licenses have been rolled into one of the new licenses or the other: RAP, Voice Service module, and mesh (both outdoor and indoor). There may be a few more, but its been a while, so I dont remember them... :)