Fixed namespaces for ~0.3 refactoring

#24