Code changes for Rename
Refactoring for Name Change