Modify some method names