[ORB-467] element name changes