[Backport] Indentation fixes.
Naming convention fixes