changes: use srv instead of srvid