NEWSOURCE-184 fixes

NAMEISPI tags added for proper names
Merge pull request #27 from Nylanfs/Ultimate-Campaign-OGL

NEWSOURCE-184 fixes