Fixing symbol name clash (I got to be more careful about my 'namespaces').