diff --git a/client.go b/client.go
index ec141cbc..b2aae7e6 100644
--- a/client.go
+++ b/client.go
@@ -109,13 +109,13 @@ func HandleQueryFunc(pattern string, handler func(RequestWriter, *Msg)) {
 // 
 //	func main() {
 //		dns.HandleQuery(".", myhandler)
-//		dns.ListenAndQuery(nil, nil)	// use defaults
+//		dns.ListenAndQuery(nil)
 //		m := new(dns.Msg)
 //		c := dns.NewClient()
 //		m.SetQuestion("miek.nl.", TypeMX)
 //		c.Do(m, "127.0.0.1:53")
 //		// ...
-//		r := <- dns.Incoming	// receive the reply in your program
+//		r := <- dns.Reply
 //	}
 func HandleQuery(pattern string, handler HandlerQueryFunc) {
 	DefaultQueryMux.Handle(pattern, handler)
diff --git a/ex/chaos/chaos.go b/ex/chaos/chaos.go
index 389a0b38..4ef06afb 100644
--- a/ex/chaos/chaos.go
+++ b/ex/chaos/chaos.go
@@ -27,12 +27,12 @@ func main() {
 	}
 	for _, a := range addr {
 		m.Question[0] = dns.Question{"version.bind.", dns.TypeTXT, dns.ClassCHAOS}
-		in, rtt, _, _ := c.ExchangeFull(m, a)
+		in, rtt, _, _ := c.ExchangeRtt(m, a)
 		if in != nil && len(in.Answer) > 0  {
 			fmt.Printf("(time %.3d µs) %v\n", rtt/1e3, in.Answer[0])
 		}
 		m.Question[0] = dns.Question{"hostname.bind.", dns.TypeTXT, dns.ClassCHAOS}
-		in, rtt, _, _ = c.ExchangeFull(m, a)
+		in, rtt, _, _ = c.ExchangeRtt(m, a)
 		if in != nil && len(in.Answer) > 0 {
 			fmt.Printf("(time %.3d µs) %v\n", rtt/1e3, in.Answer[0])
 		}
@@ -66,7 +66,7 @@ func addresses(conf *dns.ClientConfig, c *dns.Client, name string) []string {
 forever:
 	for {
 		select {
-		case r := <-c.Incoming:
+		case r := <-c.Reply:
 			if r.Reply != nil && r.Reply.Rcode == dns.RcodeSuccess {
 				for _, aa := range r.Reply.Answer {
 					switch aa.(type) {
diff --git a/ex/q/q.go b/ex/q/q.go
index f1e7404b..368050e8 100644
--- a/ex/q/q.go
+++ b/ex/q/q.go
@@ -199,7 +199,7 @@ Flags:
 forever:
 	for {
 		select {
-		case r := <-c.Incoming:
+		case r := <-c.Reply:
 			if r.Reply != nil {
 				if r.Reply.Rcode == dns.RcodeSuccess {
 					if r.Request.Id != r.Reply.Id {