Add spotify name stanza, expand zap stanza
Merge pull request #8505 from Dremora/spotify

Add spotify name stanza, expand zap stanza