More namespace fixes
Merge pull request #26 from elcodi/fix/more-incorrect-namespace

More namespace fixes