[CHORE] Fixing some more namespace issues.