Changed the names of various methods to make more sense.