Started ArtifactId refactoring.
Continued ArtifactId refactoring.

All 571u, 321/341i tests pass.
Resolved remaining ArtifactId-related issues.

All 571u, 341i tests pass.