Merge "[Manual] Fix local variable names"