Fix namespacing convention