diff --git a/crossdock/main.go b/crossdock/main.go
index c89bc57f9b6..d92f2c85402 100644
--- a/crossdock/main.go
+++ b/crossdock/main.go
@@ -19,7 +19,7 @@ import (
 const (
 	behaviorEndToEnd = "endtoend"
 
-	envCollectorSamplingHostPort = "JAEGER_COLLECTOR_SAMPLING_HOST_PORT"
+	envCollectorSamplingHostPort = "JAEGER_COLLECTOR_HC_HOST_PORT"
 	envQueryHostPort             = "JAEGER_QUERY_HOST_PORT"
 
 	envQueryHealthcheckHostPort     = "JAEGER_QUERY_HC_HOST_PORT"
@@ -78,7 +78,7 @@ func (h *clientHandler) initialize() {
 	httpHealthCheck(logger, "jaeger-collector", "http://"+collectorHealthcheckHostPort)
 
 	queryService := services.NewQueryService("http://"+queryHostPort, logger)
-	samplingService := services.NewAgentService("http://"+collectorSamplingHostPort, logger)
+	samplingService := services.NewCollectorService("http://"+collectorSamplingHostPort, logger)
 
 	traceHandler := services.NewTraceHandler(queryService, samplingService, logger)
 	behaviors := crossdock.Behaviors{
diff --git a/crossdock/services/agent.go b/crossdock/services/agent.go
index f85d9c0440d..2fc01cdb57b 100644
--- a/crossdock/services/agent.go
+++ b/crossdock/services/agent.go
@@ -18,19 +18,19 @@ import (
 
 var errSamplingRateMissing = errors.New("sampling rate is missing")
 
-// AgentService is the service used to report traces to the collector.
-type AgentService interface {
+// CollectorService is the service used to report traces to the collector.
+type CollectorService interface {
 	GetSamplingRate(service, operation string) (float64, error)
 }
 
-type agentService struct {
+type collectorService struct {
 	url    string
 	logger *zap.Logger
 }
 
-// NewAgentService returns an instance of AgentService.
-func NewAgentService(url string, logger *zap.Logger) AgentService {
-	return &agentService{
+// NewCollectorService returns an instance of CollectorService.
+func NewCollectorService(url string, logger *zap.Logger) CollectorService {
+	return &collectorService{
 		url:    url,
 		logger: logger,
 	}
@@ -41,7 +41,7 @@ func getSamplingURL(url string) string {
 }
 
 // GetSamplingRate returns the sampling rate for the service-operation from the agent service.
-func (s *agentService) GetSamplingRate(service, operation string) (float64, error) {
+func (s *collectorService) GetSamplingRate(service, operation string) (float64, error) {
 	url := fmt.Sprintf(getSamplingURL(s.url), getTracerServiceName(service))
 	resp, err := http.Get(url)
 	if err != nil {
diff --git a/crossdock/services/agent_test.go b/crossdock/services/agent_test.go
index ac1099a0756..b560a874a79 100644
--- a/crossdock/services/agent_test.go
+++ b/crossdock/services/agent_test.go
@@ -82,11 +82,11 @@ func TestGetSamplingRate(t *testing.T) {
 	defer server.Close()
 
 	// Test with no http server
-	agent := NewAgentService("", zap.NewNop())
+	agent := NewCollectorService("", zap.NewNop())
 	_, err := agent.GetSamplingRate("svc", "op")
 	require.Error(t, err)
 
-	agent = NewAgentService(server.URL, zap.NewNop())
+	agent = NewCollectorService(server.URL, zap.NewNop())
 	rate, err := agent.GetSamplingRate("svc", "op")
 	require.NoError(t, err)
 	assert.InDelta(t, 1.0, rate, 0.01)
@@ -100,7 +100,7 @@ func TestGetSamplingRateReadAllErr(t *testing.T) {
 		w.Header().Set("Content-Length", "1")
 	}))
 	defer server.Close()
-	agent := NewAgentService(server.URL, zap.NewNop())
+	agent := NewCollectorService(server.URL, zap.NewNop())
 	_, err := agent.GetSamplingRate("svc", "op")
 	require.EqualError(t, err, "unexpected EOF")
 }
diff --git a/crossdock/services/tracehandler.go b/crossdock/services/tracehandler.go
index 0b386781bf1..e2eb54c60bb 100644
--- a/crossdock/services/tracehandler.go
+++ b/crossdock/services/tracehandler.go
@@ -46,7 +46,7 @@ type testFunc func(service string, request *traceRequest) ([]*ui.Trace, error)
 // TraceHandler handles creating traces and verifying them
 type TraceHandler struct {
 	query                                 QueryService
-	agent                                 AgentService
+	agent                                 CollectorService
 	logger                                *zap.Logger
 	getClientURL                          func(service string) string
 	getTags                               func() map[string]string
@@ -57,7 +57,7 @@ type TraceHandler struct {
 }
 
 // NewTraceHandler returns a TraceHandler that can create traces and verify them
-func NewTraceHandler(query QueryService, agent AgentService, logger *zap.Logger) *TraceHandler {
+func NewTraceHandler(query QueryService, agent CollectorService, logger *zap.Logger) *TraceHandler {
 	return &TraceHandler{
 		query:  query,
 		agent:  agent,