Refactored reporter namespaces