Renames and some more horrible code that was done in class.

Because it was supposed to be done in class, not because I was lazy or anything.