Renamed server_identities to servers, active_server_identities_size to active_servers
Renamed/Removed app_server/si.