Fix namespacing weirdness