Rewrote to use NameID instances every where where I previously used just the text part of the instance.