Ajay/DC | #3710 | Fixing rename flow