NetworkClient: Rename config vars, watershed, q.e.d