correct namespace and make it configurable