changed namespace names, closes #531

This one wasn't so bad.