* do not change names while replacing FQ nodes * more solid fix * even more solid fix * fix UT failure