Srv: removed; changed all usage of Srv to Surv