Renamed some stuff that needed renaming.