[FIX] usage of namespaces