Fix up things missed in the first namespace PR
Merge pull request #74 from imkingdavid/task/namespaces

Fix up things missed in the first namespace PR