[OE-4203] Reverted namespace changes to allow for better compatibility with other branches (at this time)