Fix to regression of namespace case
Merge pull request #1170 from rossriley/minor-fixes

Fix to regression of namespace case