Little namespacing tweak