namespace fix after refactoring