Fixed namespacing of references