Fixing namespace issues
Doing it live