Rename some methods to make more sense