Revert "Revert "Add helpers for artist naming""

This reverts commit 556ef930552657b90ee796feb023f5af8c83cd7d.