Rename classes and methods to make more sense to me.