Fixed issue with name/localName resolution