fix more cgd.name, update import tool