Refactored namespaces.