[llvm] Reland "MTM: fix issues after cursory reading" (PR #101191)

[Sergei Barannikov via llvm-commits]

https://github.com/s-barannikov commented:

The renaming part is fine, but the rest of the changes look more personal prefernce than an attempt to conform to the coding standard.
Feel free to ignore my nitpicks if you get an approval. The history has already been clobbered anyway.


https://github.com/llvm/llvm-project/pull/101191