Revert "Namespace fix"

This reverts commit 9442aa4af86a08f865999e7dade07812a4732413.