Removed the last few occurences old, uncool name.