Merge "Align proto naming with server configuration"