Change more namespace

Forgot about the project properties
Merge pull request #22 from syhc/master

Change more namespace