+ [OE-4176] namespacing for API