+ [OE-4176] final (hopefully) tweaks for namespacing