Continued ArtifactId refactoring.

All 571u, 321/341i tests pass.