change some helpers name