Revert artifactId rename