Refactor some naming and such. It makes more sense this way.