Fixed nested namespaces too