Renaming some namespaces
Merge pull request #2 from philburnett/develop

Renaming some namespaces