More improvements to rename functionality, v1.3.8