namespaces adjustments