Revert "Namespaces fixed."

This reverts commit 09ce543826fc2faf489a93a199988c4f9d651445.