Use namespaces instead of generic naming

Fixes #24