Change groupId to allow publication, cleanup artifactIds for consistency