Added ability to wrap name in an element