diff --git a/broker/ipc.go b/broker/ipc.go
index b035703..8154ef8 100644
--- a/broker/ipc.go
+++ b/broker/ipc.go
@@ -97,7 +97,7 @@ func (i *IPC) ProxyPolls(arg messages.Arg, response *[]byte) error {
 	if err != nil {
 		log.Println("Warning: cannot process proxy IP: ", err.Error())
 	} else {
-		i.ctx.metrics.UpdateCountryStats(remoteIP, proxyType, natType)
+		i.ctx.metrics.UpdateProxyStats(remoteIP, proxyType, natType)
 	}
 
 	var b []byte
@@ -184,7 +184,7 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error {
 	if snowflake != nil {
 		snowflake.offerChannel <- offer
 	} else {
-		i.ctx.metrics.UpdateRendezvousStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, "denied")
+		i.ctx.metrics.UpdateClientStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, "denied")
 		resp := &messages.ClientPollResponse{Error: messages.StrNoProxies}
 		return sendClientResponse(resp, response)
 	}
@@ -192,11 +192,11 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error {
 	// Wait for the answer to be returned on the channel or timeout.
 	select {
 	case answer := <-snowflake.answerChannel:
-		i.ctx.metrics.UpdateRendezvousStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, "matched")
+		i.ctx.metrics.UpdateClientStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, "matched")
 		resp := &messages.ClientPollResponse{Answer: answer}
 		err = sendClientResponse(resp, response)
 	case <-arg.Context.Done():
-		i.ctx.metrics.UpdateRendezvousStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, "timeout")
+		i.ctx.metrics.UpdateClientStats(arg.RemoteAddr, arg.RendezvousMethod, offer.natType, "timeout")
 		resp := &messages.ClientPollResponse{Error: messages.StrTimedOut}
 		err = sendClientResponse(resp, response)
 	}
diff --git a/broker/metrics.go b/broker/metrics.go
index cdad2d3..c540f07 100644
--- a/broker/metrics.go
+++ b/broker/metrics.go
@@ -88,7 +88,7 @@ func (m *Metrics) IncrementCounter(key string) {
 	incrementMapCounter(m.counters, key)
 }
 
-func (m *Metrics) UpdateCountryStats(addr string, proxyType string, natType string) {
+func (m *Metrics) UpdateProxyStats(addr string, proxyType string, natType string) {
 
 	// perform geolocation of IP address
 	ip := net.ParseIP(addr)
@@ -140,7 +140,7 @@ func (m *Metrics) UpdateCountryStats(addr string, proxyType string, natType stri
 	}).Inc()
 }
 
-func (m *Metrics) UpdateRendezvousStats(addr string, rendezvousMethod messages.RendezvousMethod, natType, status string) {
+func (m *Metrics) UpdateClientStats(addr string, rendezvousMethod messages.RendezvousMethod, natType, status string) {
 	ip := net.ParseIP(addr)
 	country := "??"
 	if m.geoipdb != nil {
diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go
index daf9aca..90a6ef3 100644
--- a/broker/snowflake-broker_test.go
+++ b/broker/snowflake-broker_test.go
@@ -651,7 +651,7 @@ func TestInvalidGeoipFile(t *testing.T) {
 		if err := ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6"); err != nil {
 			log.Printf("loading geo ip databases returned error: %v", err)
 		}
-		ctx.metrics.UpdateCountryStats("127.0.0.1", "", NATUnrestricted)
+		ctx.metrics.UpdateProxyStats("127.0.0.1", "", NATUnrestricted)
 		So(ctx.metrics.geoipdb, ShouldBeNil)
 
 	})