Fix: router to own namespace