please revert the name changes, this doesn't help reading the diff and seeing what's meaningful.

If we need a rename patch, that let's do a standalone patch. Or do it if this function is deeper changed another time.