namespace issues (reverted from commit 2267de1361a5acdbed3eba56e015cc7eede382b6)