Update module names to match their artifactIds