modify some method names