Fixed pseudo-namespacing