+ [OE-4176] remaining element tweaks for namespacing