MAJ-1094: Changing artifactIds as proposed on the mailing list.