+ [OE-4173] updates to namespace support after review, along with test coverage