Rename some methods for consistancy