Fix namespaces references issues.