Fix namespacing issue