Revert "Modified artifactId in poms."

This reverts commit 3095363b36e88ec3863989cc18937afd69959189.