server_def -> server_definition and remove a WS as per CR