Renamed a bunch of things to have a better, more consistant naming structure.