OC-1321: fix renaming problem: parent and children