Changed the name of some methods.