Revert "Namespace fix 2 (more to come)"

This reverts commit d06fea557aac5a1448dec5bfc879d29f33371ef8.