Namespaces corrections.