Merge "Fixing proto field name style."