code improvement in Namer