Some more bundle renaming.

Fix admin class