change method names across the board