#104 Fix hardcoded namespaces