fix more cgd.name errors