git clang-format and fix variable names. NFC.