adapted some groupids and  artifactids