fix more name convention