global: old bundle names

* Fixes the old bundle names that have been left over.
* Leaves a note in the annotation documentation to mark it as outdated.

Sorry... I forgot to fix some bundles.