Rename methods to remove redundancy