Fixing some name spacing issues.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Fixing some more name-spacing issues.