Renaming fixup
Test renaming
Smarter return replacing