Modify XPath to new format.