Reverse move and rename logic
4.2.1