Another fix to changing namespace

(Note: always test before committing)