consolidating some namespaces