PDIO-228 #comment clean up id name