Changed class names because they're namespaced
release 0.1.2