Fix artifactIds and dependencies