changed namespace names, closes #531