devel: Added namespaces