Renamed some stuff. Probably broke everything.

Could someone please check over everything and pull? Cheers.