Resolved remaining ArtifactId-related issues.

All 571u, 341i tests pass.