change some method names