Renamed a bunch of vanilla stuff.

-Nuff said.