QA-5211 : fix renaming issue