Working renaming logic!