Fix namespacing (suggestion)