Use namespaces properly