Fix NAMESPACE from previous merge