support new cdi namig convention