changing namespace to a different one, and prepping for a referenceable tag.  Also making client elements optional, not required.