Namespaced some class names, fixes #1