Fix: Revert adding namespace