Replaced hard coded names with artifactIds for consistency