Change some method names