change some name convention