AUI-1332 Fix dependency injection and remove unnecessary namespacing