Fixing namespaces, it needs more work [ci skip]