Rename some method for more consistency