Merge "[Manual] Rename method parameters using Java naming conventions"