Combine matchers into spy namespace
Consolidate namespaces