refactored namespaces to get protocol to work as expected.